From: Georg Brandl <georg@python.org>
Date: Wed, 29 Oct 2014 07:55:18 +0000 (+0100)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~586
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b425891b6e803e5b9d6682ce4ac927c2853e1ca1;p=python

merge with 3.4
---

b425891b6e803e5b9d6682ce4ac927c2853e1ca1