]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.3
authorBenjamin Peterson <benjamin@python.org>
Sat, 15 Mar 2014 17:29:21 +0000 (12:29 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sat, 15 Mar 2014 17:29:21 +0000 (12:29 -0500)
1  2 
setup.py

diff --cc setup.py
Simple merge