]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
projects / puppet-stdlib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 87c0f0c af7bed2)
Merge branch '2.x' into 3.x
authorAdrien Thebo <git@somethingsinistral.net>
Mon, 8 Apr 2013 17:05:29 +0000 (10:05 -0700)
committerAdrien Thebo <git@somethingsinistral.net>
Mon, 8 Apr 2013 17:05:29 +0000 (10:05 -0700)
This ignores the 2.x .travis.yml when merging up since that version is
only applicable to the 2.x branch.

Conflicts:
.travis.yml


Trivial merge
Puppet module for stdlib