merge revision(s) 34750:

	* test/iconv/test_option.rb: enabled.  [ruby-core:42802][Bug #6061]


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

3 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index a8c35bbc28..b6ad252d96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Feb 22 23:27:52 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/iconv/test_option.rb: enabled.  [ruby-core:42802][Bug #6061]
+
 Wed Feb 22 22:04:15 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (rb_io_s_foreach): argument check before making Enumerator.
diff --git a/test/iconv/test_option.rb b/test/iconv/test_option.rb
index b210fa498a..e81df9d850 100644
--- a/test/iconv/test_option.rb
+++ b/test/iconv/test_option.rb
@@ -40,4 +40,4 @@ class TestIconv::Option < TestIconv
     assert_equal(SJIS_STR, str)
     iconv.close
   end
-end if false and defined?(TestIconv)
+end if defined?(TestIconv)
diff --git a/version.h b/version.h
index fd1c70d179..5c700e3477 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 138
+#define RUBY_PATCHLEVEL 139
 
 #define RUBY_RELEASE_DATE "2012-02-22"
 #define RUBY_RELEASE_YEAR 2012