]> granicus.if.org Git - python/commitdiff
merge with 3.2
authorGeorg Brandl <georg@python.org>
Sat, 14 Sep 2013 07:11:09 +0000 (09:11 +0200)
committerGeorg Brandl <georg@python.org>
Sat, 14 Sep 2013 07:11:09 +0000 (09:11 +0200)

Trivial merge