From: Georg Brandl <georg@python.org>
Date: Sun, 6 Oct 2013 07:42:52 +0000 (+0200)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a4~264
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7cf231f695194e81c0431bd96940ab2f37e061ad;p=thirdparty%2FPython%2Fcpython.git

merge with 3.3
---

7cf231f695194e81c0431bd96940ab2f37e061ad