]> granicus.if.org Git - python/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Tue, 17 Jun 2014 06:16:06 +0000 (23:16 -0700)
committerBenjamin Peterson <benjamin@python.org>
Tue, 17 Jun 2014 06:16:06 +0000 (23:16 -0700)
1  2 
Lib/test/test_httpservers.py

Simple merge