]> granicus.if.org Git - python/commitdiff
merge with 3.4
authorGeorg Brandl <georg@python.org>
Wed, 5 Nov 2014 19:20:45 +0000 (20:20 +0100)
committerGeorg Brandl <georg@python.org>
Wed, 5 Nov 2014 19:20:45 +0000 (20:20 +0100)

Trivial merge