From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 21 Jan 2016 06:07:43 +0000 (-0800)
Subject: merge 3.4
X-Git-Tag: v3.6.0a1~726^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d4d7737c3f294d745d6c121dabb17b76cc11b9c8;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

d4d7737c3f294d745d6c121dabb17b76cc11b9c8