From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 15 May 2015 16:19:41 +0000 (-0400)
Subject: merge 2.7.10 release branch
X-Git-Tag: v2.7.11rc1~302^2~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f465e0f9296a1959c91c03a3663ba1e94ad9f1d3;p=thirdparty%2FPython%2Fcpython.git

merge 2.7.10 release branch
---

f465e0f9296a1959c91c03a3663ba1e94ad9f1d3