From: Hunter Haugen <hunter@puppetlabs.com>
Date: Mon, 30 Jun 2014 19:08:57 +0000 (-0700)
Subject: Merge pull request #295 from cmurphy/master
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=a4b30843d810315ac222fcc9a77dd74c538d7aca;p=puppet-stdlib.git

Merge pull request #295 from cmurphy/master

Synchronize .travis.yml
---

a4b30843d810315ac222fcc9a77dd74c538d7aca