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)
commitf903790bbb9156855daab5a181233cfea9e8e5c8
tree01811d30a421a599a126b62425f113653efbc945
parent56dd0c41f665a2b70bc2e3f97406386caf034b75
parent200ca342783c438a2b829fbd54c13739b1a197f2
Merge pull request #185 from cmurphy/master

Synchronize .travis.yml