From: Adrien Thebo Date: Mon, 8 Apr 2013 17:05:29 +0000 (-0700) Subject: Merge branch '2.x' into 3.x X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=db00ce660520abfdc110d1ed0dd10bfbc708e256;p=puppet-stdlib.git 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 --- db00ce660520abfdc110d1ed0dd10bfbc708e256