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

Merge branch '3.1.x' into 4.x

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

aa3bded3dd7ab3296beb845a7a303cab70624114