From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 11 Oct 2015 02:36:40 +0000 (-0700)
Subject: merge 3.4 (#25362)
X-Git-Tag: v3.5.1rc1~180
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=062f4cec5e457a78068c942faef999886adf53ff;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#25362)
---

062f4cec5e457a78068c942faef999886adf53ff