From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sun, 27 Sep 2015 00:04:09 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~268
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=34a804767225ef5c40d58ebfc34daa37afb7fa92;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

34a804767225ef5c40d58ebfc34daa37afb7fa92