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

Merge branch '3.x' into 4.x

* 3.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
---

18212dca014d74ecc63c4e1059f7d93d9b0204fe