From: Jeff McCune <jeff@puppetlabs.com>
Date: Thu, 25 Oct 2012 22:48:01 +0000 (-0700)
Subject: Merge branch '4.x'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=aa22cded089d0d33cfd840c27caac48cee7a9013;p=puppet-stdlib.git

Merge branch '4.x'

* 4.x:
  Revert "Revert "Merge branch '2.5.x' into 3.0.x""
  Revert "Merge branch '2.5.x' into 3.0.x"
  (maint) Fix spec failures resulting from Facter API changes
---

aa22cded089d0d33cfd840c27caac48cee7a9013