]> granicus.if.org Git - python/commitdiff
Merge with 3.3
authorGeorg Brandl <georg@python.org>
Sat, 11 Jan 2014 19:04:29 +0000 (20:04 +0100)
committerGeorg Brandl <georg@python.org>
Sat, 11 Jan 2014 19:04:29 +0000 (20:04 +0100)

Trivial merge