From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 5 Apr 2015 14:03:23 +0000 (-0400)
Subject: merge 3.4 (#23872)
X-Git-Tag: v3.5.0a4~161
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=142bf565b4e095cfdf59dcb07f6480a7368f1d33;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#23872)
---

142bf565b4e095cfdf59dcb07f6480a7368f1d33