From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 21 Nov 2015 00:37:00 +0000 (-0500)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0a7b2ae55070417396c22c1fa909ee256d6d3ab6;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

0a7b2ae55070417396c22c1fa909ee256d6d3ab6