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

merge 3.4 (#21357)
---

644bb49a45b5bc81bfab3f0f8df48b889a332698