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

Merge with 3.4
---

c7e0522d42af4611965f770f849c2442cee37178