merges r21276 from trunk into ruby_1_9_1.

* lib/singleton.rb: fix documentation. [ruby-core:21038]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21305 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 7640a9b98..90fe88364 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jan  2 10:20:24 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/singleton.rb: fix documentation. [ruby-core:21038]
+
 Fri Jan  2 22:25:46 2009  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* process.c: use sigaction instead of sigset.  [ruby-core:21021]