Merge branch '2.2.x' into 2.3.x

* 2.2.x:
  (#13494) Specify the behavior of zero padded strings
  Update CHANGELOG, Modulefile for 2.1.3

Conflicts:
	CHANGELOG
	Modulefile

diff --cc CHANGELOG
index ac7c65f2f0a0479e562e83760202837d6f43c397,4fe3e284fe0b9de94c3b7aea8919c3bae96d7018..f027d4e0c85b304287cf3f209e44ab20ddfe28aa
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -1,10 -1,7 +1,14 @@@
+ 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
+ 
 +2012-03-13 Puppet Labs <support@puppetlabs.com> - 2.3.1
 +* (#13091) Fix LoadError bug with puppet apply and puppet_vardir fact
 +
 +2012-03-12 Puppet Labs <support@puppetlabs.com> - 2.3.0
 +* Add a large number of new Puppet functions
 +* Backwards compatibility preserved with 2.2.x
 +
  2011-12-30 Puppet Labs <support@puppetlabs.com> - 2.2.1
  * Documentation only release for the Forge
  

diff --cc Modulefile
index 10623db3e850f61aeaa7079159373f4eb45c7029,0be57239e52045410c731694a5d7235f252322dd..a6874cecef42c8018ba84f6051d05f47ce9e80cb
--- 1/Modulefile
--- 2/Modulefile
+++ b/Modulefile
@@@ -1,5 -1,5 +1,5 @@@
  name    'puppetlabs-stdlib'
- version '2.3.1'
 -version '2.2.2'
++version '2.3.2'
  source 'git://github.com/puppetlabs/puppetlabs-stdlib'
  author 'puppetlabs'
  license 'Apache 2.0'