]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.4 (#23873)
authorBenjamin Peterson <benjamin@python.org>
Tue, 7 Apr 2015 16:00:37 +0000 (12:00 -0400)
committerBenjamin Peterson <benjamin@python.org>
Tue, 7 Apr 2015 16:00:37 +0000 (12:00 -0400)
1  2 
Lib/smtpd.py

diff --cc Lib/smtpd.py
Simple merge