From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 7 Dec 2014 18:47:39 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~364
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=074b95da48ffb08605cf1faa80a98bea7cc8e99e;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

074b95da48ffb08605cf1faa80a98bea7cc8e99e