Merge remote-tracking branch 'upstream/1.5.x'
authorMorgan Haskel <morgan@puppetlabs.com>
Fri, 25 Jul 2014 15:53:53 +0000 (11:53 -0400)
committerMorgan Haskel <morgan@puppetlabs.com>
Fri, 25 Jul 2014 15:53:53 +0000 (11:53 -0400)
commit23149c9a3a25b347cebcc70c5c501b02709ce69a
tree33034ed407656274ebbada0b0df1ece260cd016e
parent60e50a9b65dec94fe20734404295e28d9e434a83
parent125716d2c66893371ca3b902bca9fa1d83aa96e9
Merge remote-tracking branch 'upstream/1.5.x'