From: Georg Brandl <georg@python.org>
Date: Mon, 6 Oct 2014 12:15:13 +0000 (+0200)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~744
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ae7839e19f7a36ceff76a92fb23f7bc9ba0d55f;p=python

merge with 3.4
---

4ae7839e19f7a36ceff76a92fb23f7bc9ba0d55f