]> granicus.if.org Git - python/commitdiff
Merge 3.3.
authorStefan Krah <skrah@bytereef.org>
Thu, 7 Mar 2013 00:23:01 +0000 (01:23 +0100)
committerStefan Krah <skrah@bytereef.org>
Thu, 7 Mar 2013 00:23:01 +0000 (01:23 +0100)
1  2 
setup.py

diff --cc setup.py
Simple merge