Merge branch '2.1.x' into 2.2.x

* 2.1.x:
  Update Modulefile CHANGELOG for v2.1.2 release

Conflicts:
	CHANGELOG
	Modulefile

diff --cc CHANGELOG
index dff036bf7afeb7f9378d255b809129b5f6fa5bc4,53d584b216d5ce4066d9b0fe332bd082c78078d7..96ff08c6cf9009c3dfdc8c06238f73e71dc0777f
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -1,9 -1,6 +1,12 @@@
+ 2011-12-30 Puppet Labs <support@puppetlabs.com> - 2.1.2
+ * Documentation only release for PE 2.0.x
+ 
 +2011-11-08 Puppet Labs <support@puppetlabs.com> - 2.2.0
 +* #10285 - Refactor json to use pson instead.
 +* Maint  - Add watchr autotest script
 +* Maint  - Make rspec tests work with Puppet 2.6.4
 +* #9859  - Add root_home fact and tests
 +
  2011-08-18 Puppet Labs <support@puppetlabs.com> - 2.1.1
  * Change facts.d paths to match Facter 2.0 paths.
  * /etc/facter/facts.d