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

Merge with 3.4
---

65b29696f47eeb2084a49ae6fb7e2c1614c2f0e8