Merge remote-tracking branch 'puppetlabs/1.0.x'
authorHunter Haugen <hunter@puppetlabs.com>
Wed, 18 Jun 2014 21:00:46 +0000 (14:00 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Wed, 18 Jun 2014 21:00:46 +0000 (14:00 -0700)
commitb1f2c00ca300d6c22833b2af7af0839ad751966a
tree6c3d9acbc4d1c4a781fde6229310e9ffa69f2a0e
parentd23a098c2deba9fb79ca53e2d51a8177b0f071af
parentbb3b5283fc40226cad5a616b93bef492dba37f25
Merge remote-tracking branch 'puppetlabs/1.0.x'