From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 6 Sep 2014 21:24:35 +0000 (-0400)
Subject: merge 3.4 (#22349)
X-Git-Tag: v3.5.0a1~944
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=238f5aa6a55e7b1193342453250955455998f0a4;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#22349)
---

238f5aa6a55e7b1193342453250955455998f0a4