From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 21 Mar 2016 01:06:15 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~423
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=370764a824aa7ee9faaf6f69d5c2ed2f487e11dc;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.5
---

370764a824aa7ee9faaf6f69d5c2ed2f487e11dc