From: Travis Fields <travis@puppetlabs.com>
Date: Wed, 29 Oct 2014 19:52:52 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/4.3.x'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=12f734476c3e61f86d22b5fe0a4466edeb937b63;p=puppet-stdlib.git

Merge remote-tracking branch 'origin/4.3.x'
---

12f734476c3e61f86d22b5fe0a4466edeb937b63