1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 54e5936a4e..dbaf73ba6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Aug 12 09:00:24 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* backport r32941 from trunk
+
+	* lib/rubygems:  Import RubyGems 1.8.8.  Fixes encoding of YAML gemspec
+	  from gems.  Github Issue #149
+
 Fri Aug 12 03:24:35 2011  Eric Hodel  <drbrain@segment7.net>
 
 	* backport r32935 from trunk