From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 12 Oct 2015 02:07:48 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~167
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bcbc50bbb2a3acc3ae79443f4d343f5c2e244b63;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

bcbc50bbb2a3acc3ae79443f4d343f5c2e244b63