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

Merge branch '2.4.x'

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

07700216bb916a95d376810f85551df9a3580334