Merge pull request #323 from cmurphy/master
authorHunter Haugen <hunter@puppetlabs.com>
Mon, 30 Jun 2014 19:07:27 +0000 (12:07 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Mon, 30 Jun 2014 19:07:27 +0000 (12:07 -0700)
commit98d16464c32d17e449cc12dd2406654afe81f397
treea5608949cd3218a942662e4b3a16a3f6ffa32a70
parentcf54221bd3e2b79474dc6c5cb4d6303f659eccfa
parent2ea894fe326755e83625270eb9a4444a85ca0864
Merge pull request #323 from cmurphy/master

Update Gemfile for .travis.yml defaults