]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Thu, 30 Apr 2015 21:38:14 +0000 (17:38 -0400)
committerBenjamin Peterson <benjamin@python.org>
Thu, 30 Apr 2015 21:38:14 +0000 (17:38 -0400)
1  2 
Misc/python.man

diff --cc Misc/python.man
Simple merge