From: Georg Brandl <georg@python.org>
Date: Wed, 1 Oct 2014 17:42:09 +0000 (+0200)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~795
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f7b2aa514ea6e75d456e7802432b782d8f25cf3f;p=python

merge with 3.4
---

f7b2aa514ea6e75d456e7802432b782d8f25cf3f