From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 1 Apr 2015 16:37:34 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a4~217
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=81541f448066142c04fae736c3dda23b184c32be;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

81541f448066142c04fae736c3dda23b184c32be