From: Georg Brandl <georg@python.org>
Date: Wed, 25 Feb 2015 12:07:03 +0000 (+0100)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a2~92
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=961dfa10a6f205dfee853a2e87680c78113f4be4;p=python

Merge with 3.4
---

961dfa10a6f205dfee853a2e87680c78113f4be4