From: Georg Brandl <georg@python.org>
Date: Tue, 28 Oct 2014 16:15:26 +0000 (+0100)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~605
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b7374d0271765f0abeb92f8d87b0ce9b0c2be3df;p=python

merge with 3.4
---

b7374d0271765f0abeb92f8d87b0ce9b0c2be3df