From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 12 Nov 2015 20:24:50 +0000 (-0500)
Subject: Merge with 3.4
X-Git-Tag: v3.5.1rc1~52
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=30c328f6117eea11daeccbd6c0a8b54e78aef8af;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

30c328f6117eea11daeccbd6c0a8b54e78aef8af