From: Larry Hastings <larry@hastings.org>
Date: Sun, 6 Dec 2015 00:49:19 +0000 (-0800)
Subject: Merge.
X-Git-Tag: v3.5.1~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a8f4405044f2ef834a389f50557e81221c42786c;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

a8f4405044f2ef834a389f50557e81221c42786c