From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 1 Jan 2016 17:13:10 +0000 (-0600)
Subject: merge 3.4
X-Git-Tag: v3.6.0a1~834^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f2be8d75acad3f82e8d38299b24b99068b628a6a;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

f2be8d75acad3f82e8d38299b24b99068b628a6a