From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 6 Dec 2014 01:36:07 +0000 (-0500)
Subject: merge 3.4 (#16043)
X-Git-Tag: v3.5.0a1~370
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7eda940e1f693ea419a07713fe1db9d07cbf92d0;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#16043)
---

7eda940e1f693ea419a07713fe1db9d07cbf92d0