From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 11 Dec 2014 10:33:49 +0000 (-0500)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~344
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6627902e0ffa9d5156168cf2e2983a4f13fbb8cd;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

6627902e0ffa9d5156168cf2e2983a4f13fbb8cd