From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 12 Oct 2015 06:03:41 +0000 (-0700)
Subject: merge 3.4
X-Git-Tag: v3.5.1rc1~166
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=63e80e179877bbedc3d5d31d41017365ea79ddc7;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

63e80e179877bbedc3d5d31d41017365ea79ddc7