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

merge with 3.4
---

587bac1a0a6cf56afc6c6181cf5fc2e8366b9a31