From: Georg Brandl <georg@python.org>
Date: Thu, 30 Oct 2014 21:31:35 +0000 (+0100)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~571
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f8e2a98132a16d1e40e66c5422df4a6adf0fffd;p=python

merge with 3.4
---

4f8e2a98132a16d1e40e66c5422df4a6adf0fffd