From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 12 Jun 2015 20:45:18 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~2075
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0a2db7a7ad0835855cf7489792f3128b778e60c1;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.5
---

0a2db7a7ad0835855cf7489792f3128b778e60c1