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

merge with 3.4
---

9ac894aeffebc628f6db6e8886466bd1e7997d29