From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 7 Mar 2015 14:34:49 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0a2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5f3ad8c05c115266834be8716c19301004a31a0;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

a5f3ad8c05c115266834be8716c19301004a31a0