From: Jeff McCune <jeff@puppetlabs.com>
Date: Thu, 25 Oct 2012 22:53:40 +0000 (-0700)
Subject: Merge branch '2.5.x' into 2.x
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=cc670fb3b1294a348e9afa03b75cbed8eb08ca36;p=puppet-stdlib.git

Merge branch '2.5.x' into 2.x

* 2.5.x:
  Update Modulefile, CHANGELOG for 2.5.1
---

cc670fb3b1294a348e9afa03b75cbed8eb08ca36