From: Stefan Krah <skrah@bytereef.org>
Date: Sun, 20 Jan 2013 22:19:22 +0000 (+0100)
Subject: Merge 3.3.
X-Git-Tag: v3.4.0a1~1566
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a12ff2c682df32c58fae23eef27ab0273f7b8659;p=python

Merge 3.3.
---

a12ff2c682df32c58fae23eef27ab0273f7b8659