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

Merge branch '4.x'

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

f960a0891e10055baccf94a3c1ef843cb8b473a2