summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-22 16:37:04 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-22 16:37:04 +0000
commite44b8eb3ad2b1dcc5870a4db66c6741d66ddc82c (patch)
treef6187dcd0fa4ad9517d9c7bda05c22c7ef124604 /ChangeLog
parent14044110e07b779d4eb6737b35b5e2a3bde080fd (diff)
merge revision(s) 41933:
* lib/rubygems/psych_additions.rb: Ignore Psych docs here git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42121 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b4c011884b..aad23c8c9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jul 23 01:36:43 2013 Zachary Scott <e@zzak.io>
+
+ * lib/rubygems/psych_additions.rb: Ignore Psych docs here
+
Tue Jul 23 01:34:00 2013 Koichi Sasada <ko1@atdot.net>
* test/test_tracer.rb: catch up recent rubygems changes.