]> granicus.if.org Git - python/commitdiff
merge with 3.4
authorGeorg Brandl <georg@python.org>
Tue, 25 Mar 2014 08:34:55 +0000 (09:34 +0100)
committerGeorg Brandl <georg@python.org>
Tue, 25 Mar 2014 08:34:55 +0000 (09:34 +0100)

Trivial merge