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

Merge branch '4.x'

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

f2143e081619a40d000aa100c32e2b55d366ee37