From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 28 Nov 2014 02:40:35 +0000 (-0600)
Subject: merge 2.7.9 release branch
X-Git-Tag: v2.7.10rc1~307
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=54c5d84ba9ebf1439723bf31d3b8b8be8b088c46;p=python

merge 2.7.9 release branch
---

54c5d84ba9ebf1439723bf31d3b8b8be8b088c46