]> granicus.if.org Git - python/commitdiff
merge with 3.3
authorGeorg Brandl <georg@python.org>
Sun, 14 Apr 2013 08:31:24 +0000 (10:31 +0200)
committerGeorg Brandl <georg@python.org>
Sun, 14 Apr 2013 08:31:24 +0000 (10:31 +0200)

Trivial merge