From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 23 Apr 2015 21:05:07 +0000 (-0400)
Subject: merge 3.2 (#24044)
X-Git-Tag: v3.4.4rc1~5^2~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=51454a62e235f27c28a24620c3df002d4076b57c;p=thirdparty%2FPython%2Fcpython.git

merge 3.2 (#24044)
---

51454a62e235f27c28a24620c3df002d4076b57c