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

Merge with 3.4
---

5e202086a5261f727b16ec8a5d5bf73046df1b12