From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 23 May 2015 16:03:20 +0000 (-0500)
Subject: merge 2.7.10 release branch
X-Git-Tag: v2.7.11rc1~301
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5bd3be83fa7b5ce4327fb65401219207adb5b10e;p=thirdparty%2FPython%2Fcpython.git

merge 2.7.10 release branch
---

5bd3be83fa7b5ce4327fb65401219207adb5b10e