Merge branch '1.0.x'
authorHunter Haugen <hunter@puppetlabs.com>
Thu, 5 Jun 2014 17:49:59 +0000 (10:49 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Thu, 5 Jun 2014 17:49:59 +0000 (10:49 -0700)
commit21dea17d87fb8aa3eb1b3312efa09e2eb1f36884
treee8f9012a6f588457cbeadd11ae7627a035a757e7
parent7be38d4164bf0b64a06a350622ad191b52b22c69
parent08c9ee57c46e7b6835d255126d28d39cd3e4c670
Merge branch '1.0.x'

Conflicts:
Modulefile
Modulefile