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)
commit99a0b07a22be599cf4e9899d09b3c9f8b6bb0c9d
tree4ff173b72b9379872c9bc6afe4b4d73491774db3
parent8e0887cafbba75ef1fdc1f03d55082dd5c8a21f8
parent26ea5cc6f2fe746252908eb2f5097e17dc4dc9ee
Merge pull request #301 from mhaskel/1.5.0-prep

1.5.0 prep