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

Merge with 3.5
---

9fa149dd24a8ce18a24d3ab597c2ff34912760c7