merge revision(s) 41883,41885:

	* test/net/http/test_http.rb (TestNetHTTP_v1_2#test_get,
	  TestNetHTTP_v1_2_chunked#test_get): shoudn't check
	  HttpResponse#decode_content if Zlib is not available.
	  ko1 complained via IRC.
	  TestNetHTTP_v1_2_chunked#test_get): shouldn't check


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41953 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 41902:

	* lib/logger.rb: Use :call-seq: for method signature rdoc


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41954 b2dd03c8-39d4-4d8f-98ff-823fe69b080e