From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 20 Apr 2015 03:14:57 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0b1~320^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=617ccca3af80ede56ee204353357a3de6f7f8689;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

617ccca3af80ede56ee204353357a3de6f7f8689