Merge branch '3.x' into 4.x

* 3.x:
  Update Modulefile, CHANGELOG for 2.6.0

Author: Jeff McCune

CHANGELOG

@@ -20,6 +20,33 @@
 2012-04-10 - Chris Price <[email protected]> - 3.0.0
  * (#13693) moving logic from local spec_helper to puppetlabs_spec_helper (85f96df)
 
+2012-11-28 - Peter Meier <[email protected]> - 2.6.0
+ * Add reject() function (a79b2cd)
+
+2012-09-18 - Chad Metcalf <[email protected]> - 2.6.0
+ * Add an ensure_packages function. (8a8c09e)
+
+2012-11-23 - Erik Dalén <[email protected]> - 2.6.0
+ * (#17797) min() and max() functions (9954133)
+
+2012-05-23 - Peter Meier <[email protected]> - 2.6.0
+ * (#14670) autorequire a file_line resource's path (dfcee63)
+
+2012-11-19 - Joshua Harlan Lifton <[email protected]> - 2.6.0
+ * Add join_keys_to_values function (ee0f2b3)
+
+2012-11-17 - Joshua Harlan Lifton <[email protected]> - 2.6.0
+ * Extend delete function for strings and hashes (7322e4d)
+
+2012-08-03 - Gary Larizza <[email protected]> - 2.6.0
+ * Add the pick() function (ba6dd13)
+
+2012-03-20 - Wil Cooley <[email protected]> - 2.6.0
+ * (#13974) Add predicate functions for interface facts (f819417)
+
+2012-11-06 - Joe Julian <[email protected]> - 2.6.0
+ * Add function, uriescape, to URI.escape strings. Redmine #17459 (70f4a0e)
+
 2012-10-25 - Jeff McCune <[email protected]> - 2.5.1
  * (maint) Fix spec failures resulting from Facter API changes (97f836f)