]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fcfcf85 0c80331)
merge 3.4 (#23872)
authorBenjamin Peterson <benjamin@python.org>
Sun, 5 Apr 2015 14:03:23 +0000 (10:03 -0400)
committerBenjamin Peterson <benjamin@python.org>
Sun, 5 Apr 2015 14:03:23 +0000 (10:03 -0400)
1  2 
Lib/smtpd.py patch | diff1 | diff2 | blob | history

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