Merge pull request #185 from cmurphy/master
authorHunter Haugen <hunter@puppetlabs.com>
Mon, 30 Jun 2014 19:08:22 +0000 (12:08 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Mon, 30 Jun 2014 19:08:22 +0000 (12:08 -0700)
Synchronize .travis.yml


Trivial merge