From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 6 May 2016 19:58:13 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~69
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cc20d63e641bdbe2443acdff4876d1f559a5db3c;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.5
---

cc20d63e641bdbe2443acdff4876d1f559a5db3c