From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 24 Dec 2014 19:58:47 +0000 (-0600)
Subject: merge 3.4 (#23109)
X-Git-Tag: v3.5.0a1~278
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=724bdce8b8111563edb25ba6c277f3a48ec9e8de;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#23109)
---

724bdce8b8111563edb25ba6c277f3a48ec9e8de