From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 26 Sep 2015 22:50:44 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~269
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df1fe78acbbb019658af3213b43374359e6667a8;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

df1fe78acbbb019658af3213b43374359e6667a8