From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 7 Dec 2014 18:41:52 +0000 (-0500)
Subject: merge 2.7.9 release branch
X-Git-Tag: v2.7.10rc1~287
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=204a0eca5af9c329c51ac3ab3a02e66f0b1b5e6f;p=python

merge 2.7.9 release branch
---

204a0eca5af9c329c51ac3ab3a02e66f0b1b5e6f