Merge pull request #154 from mhaskel/1.0.0-prep
authorAshley Penney <ashley.penney@puppetlabs.com>
Wed, 4 Jun 2014 18:43:06 +0000 (14:43 -0400)
committerAshley Penney <ashley.penney@puppetlabs.com>
Wed, 4 Jun 2014 18:43:06 +0000 (14:43 -0400)
1.0.0 prep


Trivial merge