From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 23 Nov 2015 03:05:14 +0000 (-0800)
Subject: merge 2.7.11 release branch
X-Git-Tag: v2.7.12rc1~382
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b37d9b46045aa7d4528292034cba1f678b186f8a;p=thirdparty%2FPython%2Fcpython.git

merge 2.7.11 release branch
---

b37d9b46045aa7d4528292034cba1f678b186f8a