From d91a05c8874dec82c73e50151136de51b7413477 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 10 Feb 2012 08:02:56 +0000
Subject: merge revision(s) 34033: [Backport #5996]

	* thread_pthread.c (rb_thread_create_timer_thread): fix memory
	  leak. [ruby-dev:44904] [Bug #5688]


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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 30fd8903fa..c4c20f6fba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb 10 17:02:12 2012  okkez  <okkez000@gmail.com>
+
+	* thread_pthread.c (rb_thread_create_timer_thread): fix memory
+	  leak. [ruby-dev:44904] [Bug #5688]
+
 Fri Feb 10 05:22:32 2012  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* cont.c (fiber_setcontext): Use longjmp() instead of swapcontext() on
-- 
cgit v1.2.3