From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 6 Mar 2015 14:09:46 +0000 (-0500)
Subject: merge 3.4 (#23590)
X-Git-Tag: v3.5.0a2~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=abda8ddd3e4927bda1b58cf60a5d09db186f6ca5;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#23590)
---

abda8ddd3e4927bda1b58cf60a5d09db186f6ca5