From: Jeff McCune <jeff@puppetlabs.com>
Date: Wed, 28 Nov 2012 22:39:34 +0000 (-0800)
Subject: Merge branch '3.x' into 4.x
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=2abf64a3068e184ec9e183a2277b21492be02ea3;p=puppet-stdlib.git

Merge branch '3.x' into 4.x

* 3.x:
  Update Modulefile, CHANGELOG for 2.6.0
---

2abf64a3068e184ec9e183a2277b21492be02ea3