]> granicus.if.org Git - python/commitdiff
merge 3.2 heads
authorEli Bendersky <eliben@gmail.com>
Fri, 2 Mar 2012 05:43:08 +0000 (07:43 +0200)
committerEli Bendersky <eliben@gmail.com>
Fri, 2 Mar 2012 05:43:08 +0000 (07:43 +0200)

Trivial merge