]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 799c669 1b407fe)
Merge from 3.1
authorSenthil Kumaran <orsenthil@gmail.com>
Sun, 20 Mar 2011 02:45:10 +0000 (10:45 +0800)
committerSenthil Kumaran <orsenthil@gmail.com>
Sun, 20 Mar 2011 02:45:10 +0000 (10:45 +0800)
1  2 
Lib/http/server.py patch | diff1 | diff2 | blob | history

diff --cc Lib/http/server.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.