]> granicus.if.org Git - python/commitdiff
Issue #11855: merge from 3.2
authorEli Bendersky <eliben@gmail.com>
Sat, 16 Apr 2011 12:36:26 +0000 (15:36 +0300)
committerEli Bendersky <eliben@gmail.com>
Sat, 16 Apr 2011 12:36:26 +0000 (15:36 +0300)

Trivial merge