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

Merge.
---

52d6c2c4c07e3e850db8cf6574619c8f24a0fb39