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

Merge branch '3.0.x' into 3.1.x

* 3.0.x:
  Revert "Merge branch '2.5.x' into 3.0.x"
---

2ce2c5bd8d138fcaf6485a6bd35c1da0f567b4d0