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

Merge branch '3.x' into 4.x

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

65d9b10876420176715b4a9a5ac3e9cedf881c1d