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

Merge with 3.4
---

4bc534d58996d4c8d311c432511de3e0ccdc95c3