From aee9d41bbeeefb023fe5463083f322a0f9ce439c Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 29 Dec 2008 06:18:14 +0000
Subject: merges r21134 from ruby_1_9_1 into trunk. *
 test/rubygems/test_gem_command.rb  
 (test_add_option_overlapping_common_and_local_options):   follows r21066.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21150 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index cd9b307f0..0e71660b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Dec 28 18:36:33 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/rubygems/test_gem_command.rb
+	  (test_add_option_overlapping_common_and_local_options):
+	  follows r21066.
+
 Mon Dec 29 14:50:19 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	* Makefile.in (ext-clean): ext-clean always fails.
-- 
cgit