From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 25 Feb 2015 21:47:20 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0a2~88
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4fa49727d7e50b7f93c1861a4520d6654e1808c9;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

4fa49727d7e50b7f93c1861a4520d6654e1808c9