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

Merge with 3.4
---

c02948126c851b53109e4c0b4b11f26a62cceba9