From: Georg Brandl <georg@python.org>
Date: Sun, 6 Oct 2013 07:17:52 +0000 (+0200)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a4~267
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dcd45552429f42e72299ad6e3e03e01a49577db6;p=python

merge with 3.3
---

dcd45552429f42e72299ad6e3e03e01a49577db6