From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 8 Apr 2015 15:11:45 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a4~137
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f1c5dea3c29d398ab58b45dd152a032489eddf58;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

f1c5dea3c29d398ab58b45dd152a032489eddf58