git.ipfire.org Git - thirdparty/Python/cpython.git/commit

]> git.ipfire.org Git - thirdparty/Python/cpython.git/commit

projects / thirdparty / Python / cpython.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 375dc9b a2ebfd0)

author	Jason R. Coombs <jaraco@jaraco.com>
	Sun, 10 Nov 2013 23:59:44 +0000 (18:59 -0500)
committer	Jason R. Coombs <jaraco@jaraco.com>
	Sun, 10 Nov 2013 23:59:44 +0000 (18:59 -0500)
commit	0048ae0cc62cba45b197976031f0680d90687ffc
tree	ed3b3568ed4f4d8f9d4ceeb86d6fb15dea327451	tree \| snapshot
parent	375dc9b8b42cd9a8b98679c751dc859620956be3	commit \| diff
parent	a2ebfd02566d6ec929e75bfadaadd250314d9a20	commit \| diff

Merge with 3.3 for Issue #19544 and Issue #6286. Merge is untested. I was unable to test due to bab0cbf86835.

Lib/distutils/command/upload.py	diff1 \|	diff2 \|	blob \| history
Lib/distutils/tests/test_upload.py	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	diff1 \|	diff2 \|	blob \| history

Mirror of https://github.com/python/cpython.git