From: Georg Brandl <georg@python.org>
Date: Thu, 2 Oct 2014 06:27:11 +0000 (+0200)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~787
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=60db5137bca8441ff145b77740178b5cd07d08b4;p=python

merge with 3.4
---

60db5137bca8441ff145b77740178b5cd07d08b4