From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 6 Nov 2014 05:53:18 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~512
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8726f2b89c9d34694b4551763e08e322fc103e06;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

8726f2b89c9d34694b4551763e08e322fc103e06