merge revision(s) 40014: [Backport #8198]
Document the default Net timeout values by @toolmantim [GH fixes #269]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@40712 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 40014: [Backport #8198]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@40712 b2dd03c8-39d4-4d8f-98ff-823fe69b080e