]> granicus.if.org Git - python/commitdiff
merge heads
authorGeorg Brandl <georg@python.org>
Tue, 8 Oct 2013 18:27:35 +0000 (20:27 +0200)
committerGeorg Brandl <georg@python.org>
Tue, 8 Oct 2013 18:27:35 +0000 (20:27 +0200)

Trivial merge