Merge pull request #334 from mhaskel/1.5.x-merge
authorAshley Penney <ashley.penney@puppetlabs.com>
Fri, 25 Jul 2014 15:56:43 +0000 (11:56 -0400)
committerAshley Penney <ashley.penney@puppetlabs.com>
Fri, 25 Jul 2014 15:56:43 +0000 (11:56 -0400)
commit3a2fe3b1aef33515652a6810365e59b7f3ee0c29
tree33034ed407656274ebbada0b0df1ece260cd016e
parent60e50a9b65dec94fe20734404295e28d9e434a83
parent23149c9a3a25b347cebcc70c5c501b02709ce69a
Merge pull request #334 from mhaskel/1.5.x-merge

1.5.x merge