* 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

1 files changed, 6 insertions, 0 deletions

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