From: Georg Brandl <georg@python.org>
Date: Sat, 11 Oct 2014 13:04:20 +0000 (+0200)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~696
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=35aa10be6cbc904432a6b017963f14352d38a567;p=python

merge with 3.4
---

35aa10be6cbc904432a6b017963f14352d38a567