From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 1 Aug 2015 02:35:00 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0rc1~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26f667676f6ea44c8d3e5a41f345acfaeca30bc2;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

26f667676f6ea44c8d3e5a41f345acfaeca30bc2