From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 14 Nov 2015 08:11:09 +0000 (-0800)
Subject: merge 3.4 (#25569)
X-Git-Tag: v3.5.1rc1~43
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2463001a15f0f1dab1b82e71f3d37b1bc7bc701f;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#25569)
---

2463001a15f0f1dab1b82e71f3d37b1bc7bc701f