From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 16 Nov 2015 12:32:46 +0000 (-0500)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5922d739d4d0d9ae29a325a752992aff2f2da612;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

5922d739d4d0d9ae29a325a752992aff2f2da612