From: Larry Hastings <larry@hastings.org>
Date: Mon, 7 Dec 2015 05:58:18 +0000 (-0800)
Subject: Merge.
X-Git-Tag: v3.4.5rc1~65
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f9c88ec3c711a61a5cea98ab3b80d4ba7d7cb877;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

f9c88ec3c711a61a5cea98ab3b80d4ba7d7cb877