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

merge 3.4
---

bcf527e0d661ab5eadd59b9c4b27e5a7feee9eb6