From: Georg Brandl <georg@python.org>
Date: Wed, 29 Oct 2014 06:59:03 +0000 (+0100)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~593
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1cf8a0aeca85f5a48d8b43fd8e5cd1be3ac8f77a;p=thirdparty%2FPython%2Fcpython.git

merge with 3.4
---

1cf8a0aeca85f5a48d8b43fd8e5cd1be3ac8f77a