From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 25 Sep 2015 03:14:02 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~277
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0588e1ab39d1b0787a39a1b56b57486243ff52e8;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

0588e1ab39d1b0787a39a1b56b57486243ff52e8