From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 24 Nov 2014 02:17:06 +0000 (-0600)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~448
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=83711e9bdf47d020d44997b74e1d24995130b992;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

83711e9bdf47d020d44997b74e1d24995130b992