From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 27 Nov 2014 05:03:34 +0000 (-0600)
Subject: merge 3.4 (#22954)
X-Git-Tag: v3.5.0a1~431
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0a59d5563ecb632a61d8e45761824c76bfacbeea;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#22954)
---

0a59d5563ecb632a61d8e45761824c76bfacbeea