From: Travis Fields <travis@puppetlabs.com>
Date: Thu, 15 Jan 2015 21:55:48 +0000 (-0800)
Subject: Merge branch '4.6.x' back to master
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=75d16ae0010940a10df3010aae1605c395df4606;p=puppet-stdlib.git

Merge branch '4.6.x' back to master
---

75d16ae0010940a10df3010aae1605c395df4606