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

merge with 3.3
---

99b1a12f2f565f0bdc959ec42268e7ef823819be