From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 31 Mar 2014 00:34:30 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~1980
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a8768336d0f9db8d516c84450249c71dac540e85;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

a8768336d0f9db8d516c84450249c71dac540e85