From: Georg Brandl <georg@python.org>
Date: Wed, 1 Oct 2014 17:28:33 +0000 (+0200)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~796
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42c189efe41bf32fd59649347e71fac1c646b93a;p=python

merge with 3.4
---

42c189efe41bf32fd59649347e71fac1c646b93a