From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 20 Oct 2015 06:15:59 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1186
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ef1c093f24add5f12193ece407a4c96afd42efd;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.5
---

1ef1c093f24add5f12193ece407a4c96afd42efd