From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 26 May 2015 02:24:26 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.4.4rc1~5^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=86c3a3b0b7b542cc268f7b8812a59a40b7c47e26;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

86c3a3b0b7b542cc268f7b8812a59a40b7c47e26