From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 7 Apr 2014 23:35:36 +0000 (-0400)
Subject: merge 3.4 (#21174)
X-Git-Tag: v3.5.0a1~1933
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa7e11f8c4ae652cbd533b78ac95c0582e03e7c5;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#21174)
---

fa7e11f8c4ae652cbd533b78ac95c0582e03e7c5