Merge branch 'master' into 1.0.x
authorHunter Haugen <hunter@puppetlabs.com>
Thu, 20 Feb 2014 20:34:07 +0000 (12:34 -0800)
committerHunter Haugen <hunter@puppetlabs.com>
Thu, 20 Feb 2014 20:34:07 +0000 (12:34 -0800)
commit1f6e2a8cabd50fb8d26601766f34bddac0df12ad
tree0d6d9eb8e7883fd8cb792297501d214755f4fc0a
parentfe25900c187613c4695adf636ab66ade6660abf0
parentf44ca040e446482801ee64522d5fda586ed3639e
Merge branch 'master' into 1.0.x