From: Georg Brandl <georg@python.org>
Date: Thu, 30 Oct 2014 21:31:08 +0000 (+0100)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~572
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dd6b84d7159b4f8a9e0f013be4b8969de6178359;p=python

merge with 3.4
---

dd6b84d7159b4f8a9e0f013be4b8969de6178359