From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 5 Nov 2014 18:10:16 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~518
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=81d9feee8d2bd85d2f61b99d5a4cf9a3251409de;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

81d9feee8d2bd85d2f61b99d5a4cf9a3251409de