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

Merge branch '2.3.x' into 2.4.x

* 2.3.x:
  (#13439) Fix test failures with Puppet 2.6.x
  (#13439) refactor spec helper for compatibility with both puppet 2.7 and master
---

6b76c338650a3af5270b6578b5e580f801c34a5b