From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 30 Jul 2015 20:44:41 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0rc1~65
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=659fcb0a8dd1c3733c609406522d95aa663f2eaa;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

659fcb0a8dd1c3733c609406522d95aa663f2eaa