From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 5 Dec 2015 08:18:11 +0000 (-0800)
Subject: merge 2.7.11 branch
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fe5c64f7276d7661693a249a4cfaa65cdabf1fa9;p=python

merge 2.7.11 branch
---

fe5c64f7276d7661693a249a4cfaa65cdabf1fa9