From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 2 Jul 2015 21:58:31 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0b3~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b32b998bf7ccc8718f1f086f2e3d2658f2e5b224;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

b32b998bf7ccc8718f1f086f2e3d2658f2e5b224