]> granicus.if.org Git - python/commitdiff
merge with 3.4
authorGeorg Brandl <georg@python.org>
Fri, 28 Mar 2014 18:49:02 +0000 (19:49 +0100)
committerGeorg Brandl <georg@python.org>
Fri, 28 Mar 2014 18:49:02 +0000 (19:49 +0100)

Trivial merge