From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 25 Sep 2014 00:22:49 +0000 (-0400)
Subject: merge 3.4 (#22484)
X-Git-Tag: v3.5.0a1~859
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=64b2a94f1032f5a2b262ab4540e39c0b9c0bf207;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#22484)
---

64b2a94f1032f5a2b262ab4540e39c0b9c0bf207