From: Jeff McCune <jeff@puppetlabs.com>
Date: Mon, 20 Aug 2012 21:25:17 +0000 (-0700)
Subject: Merge branch '3.x'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=4e25230dd3899ae117a6b621fc6233cb4b305c5a;p=puppet-stdlib.git

Merge branch '3.x'

* 3.x:
  Disable tests that fail on 2.6.x due to #15912
---

4e25230dd3899ae117a6b621fc6233cb4b305c5a