From: Brett Cannon <brett@python.org>
Date: Fri, 5 Dec 2014 16:01:30 +0000 (-0500)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~376
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1a7b8d143965c281467379123187e0ef323380c3;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

1a7b8d143965c281467379123187e0ef323380c3