]> granicus.if.org Git - python/commitdiff
#12787: merge with 3.2
authorSandro Tosi <sandro.tosi@gmail.com>
Sat, 20 Aug 2011 15:06:38 +0000 (17:06 +0200)
committerSandro Tosi <sandro.tosi@gmail.com>
Sat, 20 Aug 2011 15:06:38 +0000 (17:06 +0200)

Trivial merge