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

Trivial merge