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

Merge branch '3.1.x' into 3.x

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

9cc15a650a7950538c86a9ac3ba8ba7e2eb145ba