From 1ab4abf8c35148d8bceb6f24bdc41ebae0f94d58 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 11 Dec 2012 08:47:37 +0000
Subject: merge revision(s) 38285: [Backport #4281]

	* lib/irb/magic-file.rb: set a encoding, which is detected from
	  the file to read, to the internal encoding.
	  [Bug #4281][ruby-dev:43036]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@38313 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 version.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'version.h')

diff --git a/version.h b/version.h
index db19429db1..9be5792b4c 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 332
+#define RUBY_PATCHLEVEL 333
 
-#define RUBY_RELEASE_DATE "2012-11-15"
+#define RUBY_RELEASE_DATE "2012-12-11"
 #define RUBY_RELEASE_YEAR 2012
-#define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 15
+#define RUBY_RELEASE_MONTH 12
+#define RUBY_RELEASE_DAY 11
 
 #include "ruby/version.h"
 
-- 
cgit v1.2.3