]> granicus.if.org Git - python/commitdiff
merge with 3.3
authorGeorg Brandl <georg@python.org>
Fri, 11 Jan 2013 19:26:54 +0000 (20:26 +0100)
committerGeorg Brandl <georg@python.org>
Fri, 11 Jan 2013 19:26:54 +0000 (20:26 +0100)

Trivial merge