From: Larry Hastings <larry@hastings.org>
Date: Sun, 20 Nov 2016 19:33:15 +0000 (-0800)
Subject: Merge.
X-Git-Tag: v3.7.0a1~1938
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f8d8d18c3319ee6675a232a213322ff8434c5b33;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

f8d8d18c3319ee6675a232a213322ff8434c5b33