From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sun, 17 May 2015 18:50:06 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0b1~93
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6883faf49b4a16566cc4b1a3ea18ba125215ecc0;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

6883faf49b4a16566cc4b1a3ea18ba125215ecc0