From dbf9baeddf8679c0dfeb905d720a64e657861675 Mon Sep 17 00:00:00 2001
From: drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 16 Jun 2011 05:24:12 +0000
Subject: 	* lib/timeout.rb: Clarify timeout duration types.  Patch by
 Alf Mikula. 	  [Ruby 1.9 - Bug #4791] 	* lib/net/http.rb: ditto

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 1a4d97ee8a..753b619c8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jun 16 14:15:47 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/timeout.rb: Clarify timeout duration types.  Patch by Alf Mikula.
+	  [Ruby 1.9 - Bug #4791]
+	* lib/net/http.rb: ditto
+
 Thu Jun 16 13:25:25 2011  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/rdoc*:  Import RDoc 3.7 release candidate
-- 
cgit v1.2.3