From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 2 Feb 2015 19:06:29 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e69419ee4235f42a32b26dc3342ca8ab76bfb95;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

5e69419ee4235f42a32b26dc3342ca8ab76bfb95