From e197429a76bffa1d801c6ec46862c6f417982cdb Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 23 May 2015 17:59:31 +0000
Subject: merge revision(s) 50206: [Backport #10724]

	* vm.c (vm_exec): check other events when RETURN is thrown.
	  [Bug #10724]

	* test/ruby/test_settracefunc.rb: add a test.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50624 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 fc0de05a50..171000328e 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.2.3"
 #define RUBY_RELEASE_DATE "2015-05-24"
-#define RUBY_PATCHLEVEL 120
+#define RUBY_PATCHLEVEL 121
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 5
-- 
cgit v1.2.3