Merge pull request #534 from puppetlabs/1.6.x
authorBryan Jen <bryan.jen@gmail.com>
Thu, 21 May 2015 15:26:16 +0000 (08:26 -0700)
committerBryan Jen <bryan.jen@gmail.com>
Thu, 21 May 2015 15:26:16 +0000 (08:26 -0700)
commit35d2e407bf5cfbcedabd55d2cc754be86e8f8a68
tree42bc83686aedf4531689ed992e0b8740fdf87ecd
parentdbcfba063d4b5ba4073794880d29d1dd17392c58
parent2fd4e702706b820b1d7208e2f88ba8a8a0321701
Merge pull request #534 from puppetlabs/1.6.x

1.6.0 back to master