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

merge with 3.4
---

796fe2c934b585de77bd5444f54d2ffe08a0633d