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

merge with 3.4
---

0b452c19b7e9e68ee8d8d0bf061305d915816c3b