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

merge with 3.4
---

3fab2085b7e552e68e6c6ddd1aa2502d041f8a6c