]> granicus.if.org Git - python/commitdiff
Merge 3.2.
authorStefan Krah <skrah@bytereef.org>
Tue, 21 Aug 2012 06:25:41 +0000 (08:25 +0200)
committerStefan Krah <skrah@bytereef.org>
Tue, 21 Aug 2012 06:25:41 +0000 (08:25 +0200)
1  2 
Lib/test/test_capi.py
Objects/abstract.c

Simple merge
Simple merge