From 79634569e483d82874c9eaadf0d3a61c1b529fa8 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 8 Feb 2012 00:44:05 +0000
Subject: merge revision(s) 34028,34030:

	* error.c (name_err_mesg_to_str): clear rb_thread_t::errinfo when
	  ignore exception under rb_protect().

	* test/ruby/test_exception.rb (test_exception_in_name_error_to_str):
	  add a corresponding test.
	  ignore exception under rb_protect(). [ruby-core:41612] [Bug #5755]


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

(limited to 'version.h')

diff --git a/version.h b/version.h
index 68e938f5ef..b29f38b218 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 51
+#define RUBY_PATCHLEVEL 52
 
 #define RUBY_RELEASE_DATE "2012-02-08"
 #define RUBY_RELEASE_YEAR 2012
-- 
cgit v1.2.3