From: Georg Brandl <georg@python.org>
Date: Thu, 6 Nov 2014 13:38:23 +0000 (+0100)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~511
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2f5f2908d257eb10a98f5a47ee3dbd96492ed6fa;p=python

merge with 3.4
---

2f5f2908d257eb10a98f5a47ee3dbd96492ed6fa