]> granicus.if.org Git - python/commitdiff
merge
authorGeorg Brandl <georg@python.org>
Sat, 12 Oct 2013 20:57:30 +0000 (22:57 +0200)
committerGeorg Brandl <georg@python.org>
Sat, 12 Oct 2013 20:57:30 +0000 (22:57 +0200)

Trivial merge