]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
Merge branch '4.x'
authorJeff McCune <jeff@puppetlabs.com>
Mon, 25 Feb 2013 22:19:13 +0000 (14:19 -0800)
committerJeff McCune <jeff@puppetlabs.com>
Mon, 25 Feb 2013 22:19:13 +0000 (14:19 -0800)
commit9a06f11b11c96fff20a2e62c69a29684d943b773
tree6c523fd16a2f9f6bbcb87109fabc17e3c9e79f17
parent5b81c26d94eb763eeb044b484a22b56f71c0cd5e
parente0a2dc5b918482a5c05c0d7a6647f4e8a537616f
Merge branch '4.x'

* 4.x:
  (maint) Add Ruby 2.0.0 to Travis build matrix

Conflicts:
.gitignore
.travis.yml
Gemfile
.travis.yml
Gemfile