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

merge 3.4 (#26172)
---

b57eaeadff91fd1711289a43ecf2a13b54efde0a