]> granicus.if.org Git - python/commitdiff
Merge with 3.1.
authorGeorg Brandl <georg@python.org>
Mon, 20 Feb 2012 20:43:25 +0000 (21:43 +0100)
committerGeorg Brandl <georg@python.org>
Mon, 20 Feb 2012 20:43:25 +0000 (21:43 +0100)

Trivial merge