From: Larry Hastings <larry@hastings.org>
Date: Mon, 7 Dec 2015 06:00:57 +0000 (-0800)
Subject: Merge.
X-Git-Tag: v3.6.0a1~941^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d785da8fbbeec75c797e0e924d4d685f10638a12;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

d785da8fbbeec75c797e0e924d4d685f10638a12