Merge pull request #301 from mhaskel/1.5.0-prep
authorAshley Penney <ashley.penney@puppetlabs.com>
Wed, 21 May 2014 23:29:26 +0000 (16:29 -0700)
committerAshley Penney <ashley.penney@puppetlabs.com>
Wed, 21 May 2014 23:29:26 +0000 (16:29 -0700)
1.5.0 prep


Trivial merge