From: Georg Brandl <georg@python.org>
Date: Tue, 2 Apr 2013 09:07:27 +0000 (+0200)
Subject: merge
X-Git-Tag: v3.2.4~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ef0faa5c59cc5252f55cf347c26706337eeb9ba1;p=python

merge
---

ef0faa5c59cc5252f55cf347c26706337eeb9ba1