]> granicus.if.org Git - python/commitdiff
merge heads
authorGeorg Brandl <georg@python.org>
Thu, 6 Nov 2014 13:56:47 +0000 (14:56 +0100)
committerGeorg Brandl <georg@python.org>
Thu, 6 Nov 2014 13:56:47 +0000 (14:56 +0100)

Trivial merge