From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 5 Nov 2013 15:09:52 +0000 (-0500)
Subject: merge 2.7.6 release branch
X-Git-Tag: v2.7.8~290^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3de21048044caa8fa6b191d1a14844e6b5ec6fe9;p=python

merge 2.7.6 release branch
---

3de21048044caa8fa6b191d1a14844e6b5ec6fe9