Merge branch '2.1.x' into 2.2.x

* 2.1.x:
  Update CHANGELOG, Modulefile for 2.1.3

Conflicts:
	CHANGELOG
	Modulefile

2 files changed, 5 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 318cbe9..4fe3e28 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+2012-03-29 Puppet Labs <support@puppetlabs.com> - 2.1.3
+* (#11607) Add Rakefile to enable spec testing
+* (#12377) Avoid infinite loop when retrying require json
+
 2011-12-30 Puppet Labs <support@puppetlabs.com> - 2.2.1
 * Documentation only release for the Forge
 
diff --git a/Modulefile b/Modulefile
index 3efa8b9..0be5723 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
 name    'puppetlabs-stdlib'
-version '2.2.1'
+version '2.2.2'
 source 'git://github.com/puppetlabs/puppetlabs-stdlib'
 author 'puppetlabs'
 license 'Apache 2.0'