From e4256538fd3488bbf0aef14124f7dfcf5027eb17 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 7 Jul 2014 02:49:13 +0000
Subject: merge revision(s) 45845,45847: [Backport #9786]

	* parse.y (local_tbl_gen): remove local variables duplicated with
	  arguments.
	  [ruby-core:60501] [Bug #9486]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@46731 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 3e8e56f6c0..d0d8d71952 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
+Mon Jul  7 11:47:51 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (local_tbl_gen): remove local variables duplicated with
+	  arguments.
+
 Thu Jul  3 15:17:22 2014  Koichi Sasada  <ko1@atdot.net>
 
+	  [ruby-core:60501] [Bug #9486]
 	* vm.c (rb_vm_pop_cfunc_frame): added.  It cares c_return event.
 	  The patch base by drkaes (Stefan Kaes).
 	  [Bug #9321]
-- 
cgit v1.2.3