From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sun, 27 Jul 2014 07:01:29 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1182
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6aef4dc1bdf24bc26a1e6b6e83746cd86355022f;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

6aef4dc1bdf24bc26a1e6b6e83746cd86355022f