Merge pull request #345 from mhaskel/merge_1.5.x_changes
authorAshley Penney <ashley.penney@puppetlabs.com>
Tue, 12 Aug 2014 16:48:44 +0000 (12:48 -0400)
committerAshley Penney <ashley.penney@puppetlabs.com>
Tue, 12 Aug 2014 16:48:44 +0000 (12:48 -0400)
commit239232bbd44c6dabc3f305bd23b354481d9f8a71
tree416d2d7730fbcd7cb378f78452137d5637814e74
parentf4dd4f8ab50d9015552befa44ba613cfa15fb72e
parentc7b88aae38af8354fc026d515be605ca37cce0da
Merge pull request #345 from mhaskel/merge_1.5.x_changes

Merge 1.5.x changes