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

merge with 3.4
---

95517e4aeeb2bc8c498d9905da9a7ab8f5ab52ec