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

Merge with 3.4
---

b9731f26c3bc1e491cac5b7922b3a26b5b2b9456