From: Georg Brandl <georg@python.org>
Date: Sun, 12 May 2013 09:24:58 +0000 (+0200)
Subject: merge
X-Git-Tag: v3.4.0a1~743
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d1ef30fa60405d55faf104f257b98c2bde4f0e45;p=thirdparty%2FPython%2Fcpython.git

merge
---

d1ef30fa60405d55faf104f257b98c2bde4f0e45