From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 1 Apr 2015 01:21:09 +0000 (-0400)
Subject: merge 3.4 (#12855)
X-Git-Tag: v3.5.0a4~226
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f8521d55ad8f3d52bdf7a350214581e2888c0361;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#12855)
---

f8521d55ad8f3d52bdf7a350214581e2888c0361