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

merge 2.7.10 release branch
---

b1f3797450da9970b97d1c514ebc476d563d7cc8