]> granicus.if.org Git - python/commitdiff
merge heads
authorGeorg Brandl <georg@python.org>
Sun, 12 Jan 2014 07:10:39 +0000 (08:10 +0100)
committerGeorg Brandl <georg@python.org>
Sun, 12 Jan 2014 07:10:39 +0000 (08:10 +0100)

Trivial merge