From: Georg Brandl <georg@python.org>
Date: Mon, 20 Oct 2014 06:36:09 +0000 (+0200)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~626
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=35c78ba7ec00b7c007bb8a1b8f77cf3651d19209;p=python

merge with 3.4
---

35c78ba7ec00b7c007bb8a1b8f77cf3651d19209