From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 28 Sep 2015 08:53:12 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1414
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=69158d56a0ff60123b6d0e9cdbf473ee05ef13e1;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.5
---

69158d56a0ff60123b6d0e9cdbf473ee05ef13e1