From: Morgan Haskel <morgan@puppetlabs.com>
Date: Wed, 17 Dec 2014 01:32:40 +0000 (-0800)
Subject: Merge remote-tracking branch 'upstream/4.5.x' into merge_4.5.x_into_master
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=49acade831d06182bb63a0c8042341a07db2e5b0;p=puppet-stdlib.git

Merge remote-tracking branch 'upstream/4.5.x' into merge_4.5.x_into_master

Conflicts:
	metadata.json
---

49acade831d06182bb63a0c8042341a07db2e5b0