]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge from 3.3
authorAndrew Kuchling <amk@amk.ca>
Tue, 12 Nov 2013 15:03:20 +0000 (10:03 -0500)
committerAndrew Kuchling <amk@amk.ca>
Tue, 12 Nov 2013 15:03:20 +0000 (10:03 -0500)
1  2 
Doc/library/pickle.rst
Doc/library/smtpd.rst

Simple merge
Simple merge