From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 14 Apr 2014 15:48:29 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~1893
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f33201b6dbb700b6d07b25bfeb63deeaf1446419;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

f33201b6dbb700b6d07b25bfeb63deeaf1446419