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

Merge with 3.4
---

cd49a7de4a00b1f94aabe5598c3da9ebd0d0c50d