From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 18 Feb 2015 13:55:59 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0a2~123
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9dd25dd693c31548a91b959052e1ee062516874e;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

9dd25dd693c31548a91b959052e1ee062516874e