From: Georg Brandl <georg@python.org>
Date: Tue, 30 Sep 2014 20:24:08 +0000 (+0200)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~808
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8da4287a774fe8f26d6c47c501cf17a365ab922;p=python

merge with 3.4
---

c8da4287a774fe8f26d6c47c501cf17a365ab922