From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 10 Apr 2014 04:15:34 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~1914
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b4c7ed6eb075e6ebb479e64ee77820607d6d3b7;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

8b4c7ed6eb075e6ebb479e64ee77820607d6d3b7