Merge branch 'release_1.0.1' into 1.0.x
authorHunter Haugen <hunter@puppetlabs.com>
Wed, 18 Jun 2014 16:02:16 +0000 (09:02 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Wed, 18 Jun 2014 16:02:16 +0000 (09:02 -0700)
commitd4eb4b97122ecfd06f55a26ae9f53ffa54caf35c
tree070c57e1f1de51cac18d4ee1449a7c4e4ab479e0
parentc604c43ef89b8bc181c3016c907fc6584d566f67
parent57cd521d35a4ea169382479403fbc89437428ae1
Merge branch 'release_1.0.1' into 1.0.x