From: Steven D'Aprano <steve@pearwood.info>
Date: Tue, 1 Dec 2015 14:10:09 +0000 (+1100)
Subject: Merge heads.
X-Git-Tag: v3.4.4rc1~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f02de4938ec51e1cb1f867f40c457b1b7c2c6dd9;p=thirdparty%2FPython%2Fcpython.git

Merge heads.
---

f02de4938ec51e1cb1f867f40c457b1b7c2c6dd9