]> granicus.if.org Git - python/commitdiff
merge 3.2 (#21766)
authorBenjamin Peterson <benjamin@python.org>
Sun, 15 Jun 2014 01:40:10 +0000 (18:40 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sun, 15 Jun 2014 01:40:10 +0000 (18:40 -0700)
1  2 
Lib/http/server.py
Lib/test/test_httpservers.py
Misc/NEWS

Simple merge
Simple merge
diff --cc Misc/NEWS
Simple merge