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-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b37d9b46045aa7d4528292034cba1f678b186f8a;p=python

merge 2.7.11 release branch
---

b37d9b46045aa7d4528292034cba1f678b186f8a