From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 30 Oct 2015 04:11:22 +0000 (-0700)
Subject: merge 3.4 (#25504)
X-Git-Tag: v3.5.1rc1~116
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=adf8627f41b22ba0d0ba47a0da12a49ba64064e7;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#25504)
---

adf8627f41b22ba0d0ba47a0da12a49ba64064e7