From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 4 May 2014 00:18:56 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~1742
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=98baa14109322ddae497bc8d823cc0bb1071b445;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

98baa14109322ddae497bc8d823cc0bb1071b445