Merge branch '2.x' into 3.x

* 2.x:
  Update Modulefile, CHANGELOG for 2.6.0

Conflicts:
	CHANGELOG
	Modulefile

diff --cc CHANGELOG
index 4578026cb55159b1f5bb6b7fbd006d6541bb6436,b7c3cedbf294fb7e9e92fec96a962d966578a363..bce9ae24d019dd8a8dd1e802cf8d2e760cea0e2a
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -1,25 -1,30 +1,52 @@@
 +2012-10-25 - Jeff McCune <jeff@puppetlabs.com> - 3.1.1
 + * (maint) Fix spec failures resulting from Facter API changes (97f836f)
 +
 +2012-10-23 - Matthaus Owens <matthaus@puppetlabs.com> - 3.1.0
 + * Add PE facts to stdlib (cdf3b05)
 +
 +2012-08-16 - Jeff McCune <jeff@puppetlabs.com> - 3.0.1
 + * Fix accidental removal of facts_dot_d.rb in 3.0.0 release
 +
 +2012-08-16 - Jeff McCune <jeff@puppetlabs.com> - 3.0.0
 + * stdlib 3.0 drops support with Puppet 2.6
 + * stdlib 3.0 preserves support with Puppet 2.7
 +
 +2012-08-07 - Dan Bode <dan@puppetlabs.com> - 3.0.0
 + * Add function ensure_resource and defined_with_params (ba789de)
 +
 +2012-07-10 - Hailee Kenney <hailee@puppetlabs.com> - 3.0.0
 + * (#2157) Remove facter_dot_d for compatibility with external facts (f92574f)
 +
 +2012-04-10 - Chris Price <chris@puppetlabs.com> - 3.0.0
 + * (#13693) moving logic from local spec_helper to puppetlabs_spec_helper (85f96df)
 +
+ 2012-11-28 - Peter Meier <peter.meier@immerda.ch> - 2.6.0
+  * Add reject() function (a79b2cd)
+ 
+ 2012-09-18 - Chad Metcalf <chad@wibidata.com> - 2.6.0
+  * Add an ensure_packages function. (8a8c09e)
+ 
+ 2012-11-23 - Erik Dalén <dalen@spotify.com> - 2.6.0
+  * (#17797) min() and max() functions (9954133)
+ 
+ 2012-05-23 - Peter Meier <peter.meier@immerda.ch> - 2.6.0
+  * (#14670) autorequire a file_line resource's path (dfcee63)
+ 
+ 2012-11-19 - Joshua Harlan Lifton <lifton@puppetlabs.com> - 2.6.0
+  * Add join_keys_to_values function (ee0f2b3)
+ 
+ 2012-11-17 - Joshua Harlan Lifton <lifton@puppetlabs.com> - 2.6.0
+  * Extend delete function for strings and hashes (7322e4d)
+ 
+ 2012-08-03 - Gary Larizza <gary@puppetlabs.com> - 2.6.0
+  * Add the pick() function (ba6dd13)
+ 
+ 2012-03-20 - Wil Cooley <wcooley@pdx.edu> - 2.6.0
+  * (#13974) Add predicate functions for interface facts (f819417)
+ 
+ 2012-11-06 - Joe Julian <me@joejulian.name> - 2.6.0
+  * Add function, uriescape, to URI.escape strings. Redmine #17459 (70f4a0e)
+ 
  2012-10-25 - Jeff McCune <jeff@puppetlabs.com> - 2.5.1
   * (maint) Fix spec failures resulting from Facter API changes (97f836f)