From: Jeff McCune <jeff@puppetlabs.com>
Date: Thu, 18 Aug 2011 19:07:29 +0000 (-0700)
Subject: Merge branch 'v2.x'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=05018f68199470f5f43e68bd54c7a39c9e8b3a85;p=puppet-stdlib.git

Merge branch 'v2.x'

* v2.x:
  Update CHANGELOG, README and Modulefile for v2.1.1
---

05018f68199470f5f43e68bd54c7a39c9e8b3a85