Merge branch '2.1.x' into 2.2.x

* 2.1.x:
  Update CHANGELOG, Modulefile for 2.1.3

Conflicts:
	CHANGELOG
	Modulefile

diff --cc CHANGELOG
index 318cbe97efc313d0544f05cb900d0d6bf68bb48a,80173627377a9c90dee9f3fddbfb781eb1ef226e..4fe3e284fe0b9de94c3b7aea8919c3bae96d7018
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -1,6 -1,7 +1,10 @@@
+ 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
 +
  2011-12-30 Puppet Labs <support@puppetlabs.com> - 2.1.2
  * Documentation only release for PE 2.0.x
  

diff --cc Modulefile
index 3efa8b97e85696d39ba5ffd3b3a49a6f39f8fd8b,2ba8cdc84053fc94e06df6f2d0c2617542a89304..0be57239e52045410c731694a5d7235f252322dd
--- 1/Modulefile
--- 2/Modulefile
+++ b/Modulefile
@@@ -1,5 -1,5 +1,5 @@@
  name    'puppetlabs-stdlib'
- version '2.2.1'
 -version '2.1.3'
++version '2.2.2'
  source 'git://github.com/puppetlabs/puppetlabs-stdlib'
  author 'puppetlabs'
  license 'Apache 2.0'