From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 13 Dec 2014 21:13:31 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~321
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2a7d05a9f2ab15b8e0e5bf024e230748681ec72b;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

2a7d05a9f2ab15b8e0e5bf024e230748681ec72b