From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 23 Sep 2015 01:10:49 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~291
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e6201e8a9e08d11348ffca27d85d88d24d74f5d;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

5e6201e8a9e08d11348ffca27d85d88d24d74f5d