From: Stefan Krah <skrah@bytereef.org>
Date: Sun, 16 Dec 2012 20:11:35 +0000 (+0100)
Subject: Merge 3.3.
X-Git-Tag: v3.4.0a1~1840
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e47b8767b3a5b37fdc76ddcd11d0f2bf1d99933;p=python

Merge 3.3.
---

8e47b8767b3a5b37fdc76ddcd11d0f2bf1d99933