]> granicus.if.org Git - python/commitdiff
merge
authorGeorg Brandl <georg@python.org>
Tue, 2 Apr 2013 09:07:27 +0000 (11:07 +0200)
committerGeorg Brandl <georg@python.org>
Tue, 2 Apr 2013 09:07:27 +0000 (11:07 +0200)

Trivial merge