From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 27 Sep 2015 08:16:12 +0000 (-0700)
Subject: merge 3.4 (#25245)
X-Git-Tag: v3.5.1rc1~266
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bdb93c3e638a1b8191d68052b3cea2a0475bc530;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#25245)
---

bdb93c3e638a1b8191d68052b3cea2a0475bc530