From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 30 Nov 2014 04:06:22 +0000 (-0500)
Subject: merge 2.7.9 release branch
X-Git-Tag: v2.7.10rc1~305
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ca9810a7f73cd04df46359d97574abddef19483e;p=thirdparty%2FPython%2Fcpython.git

merge 2.7.9 release branch
---

ca9810a7f73cd04df46359d97574abddef19483e