From: Jeff McCune <jeff@puppetlabs.com>
Date: Thu, 29 Mar 2012 23:55:46 +0000 (-0700)
Subject: Merge branch '2.2.x' into 2.3.x
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=6065628493e775e3e6ddb59f272bd36a9e9fe072;p=puppet-stdlib.git

Merge branch '2.2.x' into 2.3.x

* 2.2.x:
  (#13439) Fix test failures with Puppet 2.6.x
---

6065628493e775e3e6ddb59f272bd36a9e9fe072