From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 20 Oct 2015 06:15:43 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~142
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ae94062ae9f3dcfa6933360482dc8c5839c0cf98;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

ae94062ae9f3dcfa6933360482dc8c5839c0cf98