From: Georg Brandl <georg@python.org>
Date: Wed, 5 Nov 2014 19:20:45 +0000 (+0100)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~517
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6e54ab9b5538904c27bebb331aaab1e9c0077e1;p=python

merge with 3.4
---

e6e54ab9b5538904c27bebb331aaab1e9c0077e1