]> granicus.if.org Git - python/commitdiff
Merge with 3.2
authorGeorg Brandl <georg@python.org>
Mon, 1 Aug 2011 20:59:40 +0000 (22:59 +0200)
committerGeorg Brandl <georg@python.org>
Mon, 1 Aug 2011 20:59:40 +0000 (22:59 +0200)

Trivial merge