]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: af9049e 5128173)
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 patch | diff1 | diff2 | blob | history

diff --cc setup.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.