From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 17 May 2016 22:18:55 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a2~277
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=40a05621f9ec19099a45d0b03d7ddb7ea5ebf7c9;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.5
---

40a05621f9ec19099a45d0b03d7ddb7ea5ebf7c9