merges r30147 from trunk into ruby_1_9_2.

--
* test/irb/test_option.rb (test_end_of_option): don't read .irbrc.  Bug#4138

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

2 files changed, 2 insertions, 2 deletions

diff --git a/test/irb/test_option.rb b/test/irb/test_option.rb
index 846d7185a5..5e29803bb6 100644
--- a/test/irb/test_option.rb
+++ b/test/irb/test_option.rb
@@ -5,7 +5,7 @@ module TestIRB
   class TestOption < Test::Unit::TestCase
     def test_end_of_option
       bug4117 = '[ruby-core:33574]'
-      status = assert_in_out_err(%w[-rirb -e IRB.start(__FILE__) -- --], "", //, [], bug4117)
+      status = assert_in_out_err(%w[-rirb -e IRB.start(__FILE__) -- -f --], "", //, [], bug4117)
       assert(status.success?, bug4117)
     end
   end
diff --git a/version.h b/version.h
index 556c99046b..477e9f5556 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 123
+#define RUBY_PATCHLEVEL 124
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1