From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 4 Nov 2015 06:42:08 +0000 (-0800)
Subject: merge heads
X-Git-Tag: v2.7.11rc1~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=40559cedb5883d76b308a13106eb807801834556;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

40559cedb5883d76b308a13106eb807801834556