From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 2 Dec 2014 23:45:45 +0000 (-0500)
Subject: merge 2.7.9 release branch
X-Git-Tag: v2.7.10rc1~299
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2268c877c7997dbfe0ca4f9d99a83259288fc5a9;p=python

merge 2.7.9 release branch
---

2268c877c7997dbfe0ca4f9d99a83259288fc5a9