From: Petri Lehtinen <petri@digip.org>
Date: Sun, 23 Oct 2011 18:07:50 +0000 (+0300)
Subject: Merge 3.2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a2a2e480f335b8758a159ea72ab0067127d1d303;p=python

Merge 3.2
---

a2a2e480f335b8758a159ea72ab0067127d1d303