From: Barry Warsaw <barry@python.org>
Date: Mon, 11 Jan 2016 20:53:19 +0000 (-0500)
Subject: Merge heads.
X-Git-Tag: v3.6.0a1~791^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e9736204720b7a3d1a4c17d7c69958f464c9b69a;p=thirdparty%2FPython%2Fcpython.git

Merge heads.
---

e9736204720b7a3d1a4c17d7c69958f464c9b69a