From: Georg Brandl <georg@python.org>
Date: Wed, 29 Oct 2014 07:07:50 +0000 (+0100)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~591
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d51c1a195322e24e86a3c10eaf444a97dbc35b4a;p=python

merge with 3.4
---

d51c1a195322e24e86a3c10eaf444a97dbc35b4a