From: Georg Brandl <georg@python.org>
Date: Mon, 6 Oct 2014 14:48:38 +0000 (+0200)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~741
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=033ec051f8b0e49c3c3ebeab6a1a649d81740308;p=thirdparty%2FPython%2Fcpython.git

merge with 3.4
---

033ec051f8b0e49c3c3ebeab6a1a649d81740308