From: Morgan Haskel <morgan@puppetlabs.com>
Date: Tue, 9 Dec 2014 16:23:39 +0000 (-0800)
Subject: Merge pull request #376 from cmurphy/master
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=46ce05e4a50fc9c943ed4b5bca96ecc416a23115;p=puppet-stdlib.git

Merge pull request #376 from cmurphy/master

Update .travis.yml, Gemfile, Rakefile, and CONTRIBUTING.md
---

46ce05e4a50fc9c943ed4b5bca96ecc416a23115