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)
Conflicts:
Modulefile


No differences found