From: Georg Brandl <georg@python.org>
Date: Wed, 29 Oct 2014 09:27:06 +0000 (+0100)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~584
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=794e9bf1fe5bd0000f90c1502b16c96eb68a59af;p=python

merge with 3.4
---

794e9bf1fe5bd0000f90c1502b16c96eb68a59af