]> granicus.if.org Git - python/commitdiff
Merge 3.3.
authorStefan Krah <skrah@bytereef.org>
Wed, 16 Jan 2013 13:49:15 +0000 (14:49 +0100)
committerStefan Krah <skrah@bytereef.org>
Wed, 16 Jan 2013 13:49:15 +0000 (14:49 +0100)
1  2 
setup.py

diff --cc setup.py
Simple merge