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

merge with 3.4
---

bbf3a40c401d9ff39353d906b24726310e18e3ce