]> granicus.if.org Git - python/commitdiff
Merge 3.2.
authorStefan Krah <skrah@bytereef.org>
Mon, 20 Aug 2012 15:20:46 +0000 (17:20 +0200)
committerStefan Krah <skrah@bytereef.org>
Mon, 20 Aug 2012 15:20:46 +0000 (17:20 +0200)
1  2 
Python/bltinmodule.c

Simple merge