From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 7 Oct 2015 02:37:15 +0000 (-0700)
Subject: merge heads
X-Git-Tag: v2.7.11rc1~78
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cf0d512fb454f41737f74c898a810756196f9d52;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

cf0d512fb454f41737f74c898a810756196f9d52