]> granicus.if.org Git - python/commitdiff
#14289: merge with 3.2
authorGeorg Brandl <georg@python.org>
Wed, 14 Mar 2012 07:18:59 +0000 (08:18 +0100)
committerGeorg Brandl <georg@python.org>
Wed, 14 Mar 2012 07:18:59 +0000 (08:18 +0100)

Trivial merge