Merge branch '2.5.x'

* 2.5.x:
  Update Modulefile, CHANGELOG for 2.5.0

Conflicts:
	CHANGELOG
	Modulefile

diff --cc CHANGELOG
index f1bb6679fe70206e07c05b7411828abd75e0673f,579297958935c310811dcfae104937f1336fa274..82f8a6ef04b5ce580ca85f128df849a38b2f4f4e
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -1,19 -1,27 +1,43 @@@
 +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-10-23 - Matthaus Owens <matthaus@puppetlabs.com> - 2.5.0
+  * Add PE facts to stdlib (cdf3b05)
+ 
+ 2012-08-15 - Dan Bode <dan@puppetlabs.com> - 2.5.0
+  * Explicitly load functions used by ensure_resource (9fc3063)
+ 
+ 2012-08-13 - Dan Bode <dan@puppetlabs.com> - 2.5.0
+  * Add better docs about duplicate resource failures (97d327a)
+ 
+ 2012-08-13 - Dan Bode <dan@puppetlabs.com> - 2.5.0
+  * Handle undef for parameter argument (4f8b133)
+ 
+ 2012-08-07 - Dan Bode <dan@puppetlabs.com> - 2.5.0
+  * Add function ensure_resource and defined_with_params (a0cb8cd)
+ 
+ 2012-08-20 - Jeff McCune <jeff@puppetlabs.com> - 2.5.0
+  * Disable tests that fail on 2.6.x due to #15912 (c81496e)
+ 
+ 2012-08-20 - Jeff McCune <jeff@puppetlabs.com> - 2.5.0
+  * (Maint) Fix mis-use of rvalue functions as statements (4492913)
+ 
+ 2012-08-20 - Jeff McCune <jeff@puppetlabs.com> - 2.5.0
+  * Add .rspec file to repo root (88789e8)
+ 
  2012-06-07 - Chris Price <chris@puppetlabs.com> - 2.4.0
   * Add support for a 'match' parameter to file_line (a06c0d8)