Merge branch 'master' into 1.0.x
authorHunter Haugen <hunter@puppetlabs.com>
Mon, 16 Jun 2014 17:15:28 +0000 (10:15 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Mon, 16 Jun 2014 17:15:28 +0000 (10:15 -0700)

Trivial merge