From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 3 Sep 2014 23:29:31 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~967
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2fd145a3e926e0151c65fcce43468e2b56175091;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

2fd145a3e926e0151c65fcce43468e2b56175091