From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 11 Oct 2014 00:58:43 +0000 (-0400)
Subject: merge 3.4 (closes #22605)
X-Git-Tag: v3.5.0a1~699
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=588dad0308b781d19adfc62f623b1842dc47ae2f;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (closes #22605)
---

588dad0308b781d19adfc62f623b1842dc47ae2f