* merge -c 11988

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@12018 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index f141f91fdf..e8bcc5e0ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Mar  4 23:53:27 2007  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb (mv): could not move a directory between
+	  different filesystems. [ruby-dev:30411]
+
 Sat Mar  3 21:41:31 2007  Akinori MUSHA  <knu@iDaemons.org>
 
 	* eval.c (stack_check): Unset inline to fix build with GCC 3.4.6;