From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 6 Jul 2016 21:04:29 +0000 (-0700)
Subject: merge 3.4
X-Git-Tag: v3.6.0a3~31^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1af8b63447033e156eaf7bf9620a242089fa9f5b;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

1af8b63447033e156eaf7bf9620a242089fa9f5b