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

merge 3.4
---

c7fee85319cff60a1cbf0371b23c24915f4b1279