merge revision(s) r40833:

	Default script encoding is now UTF-8

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

3 files changed, 9 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index f8549443e6..a035245923 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 18 22:38:01 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/envutil.rb (Test::Unit::Assertions#assert_separately):
+	  specify the encoding of source.
+
 Mon Feb 17 02:00:36 2014  Tanaka Akira  <akr@fsij.org>
 
 	* lib/open-uri.rb: Make proxy disabling working again.
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index 69bd7f7472..b3384234d5 100644
--- a/test/ruby/envutil.rb
+++ b/test/ruby/envutil.rb
@@ -160,7 +160,7 @@ module Test
         code.sub!(/\A(?:\xef\xbb\xbf)?(\s*\#.*$)*(\n)?/n) {
           "#$&#{"\n" if $1 && !$2}BEGIN{throw tag, :ok}\n"
         }
-        code.force_encoding("us-ascii")
+        code.force_encoding(Encoding::UTF_8)
         verbose, $VERBOSE = $VERBOSE, nil
         yield if defined?(yield)
         case
diff --git a/version.h b/version.h
index 7cf73dea81..a2967c8e11 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2014-02-17"
-#define RUBY_PATCHLEVEL 433
+#define RUBY_RELEASE_DATE "2014-02-18"
+#define RUBY_PATCHLEVEL 434
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 17
+#define RUBY_RELEASE_DAY 18
 
 #include "ruby/version.h"