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)

Trivial merge