From: Georg Brandl <georg@python.org>
Date: Tue, 28 Oct 2014 20:38:54 +0000 (+0100)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~602
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a3e80deac1474f86bb01b024c276e8a6e6d78901;p=python

merge with 3.4
---

a3e80deac1474f86bb01b024c276e8a6e6d78901