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

Merge with 3.4
---

c7792160ddf8eea5f2a14cf0d957ac9a89615adb