]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
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)
commitdb00ce660520abfdc110d1ed0dd10bfbc708e256
treed6e00ece57167148343ed93b6fef7ff5ea306898
parent87c0f0c45418b276942e3de6deb8a2b681566019
parentaf7bed2bc82be0123e2aefe5d569661718e0d6f4
Merge branch '2.x' into 3.x

This ignores the 2.x .travis.yml when merging up since that version is
only applicable to the 2.x branch.

Conflicts:
.travis.yml