From: Georg Brandl <georg@python.org>
Date: Wed, 15 Jun 2016 06:58:00 +0000 (+0200)
Subject: merge with 3.4
X-Git-Tag: v3.6.0a3~140^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b14f0c640967c289b08be86261ac6d886cbf751b;p=thirdparty%2FPython%2Fcpython.git

merge with 3.4
---

b14f0c640967c289b08be86261ac6d886cbf751b