From: Stefan Krah <skrah@bytereef.org>
Date: Sun, 23 Dec 2012 14:46:03 +0000 (+0100)
Subject: Merge 3.3.
X-Git-Tag: v3.4.0a1~1794
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=823359610f6066fbffaf1907154926008d720c58;p=python

Merge 3.3.
---

823359610f6066fbffaf1907154926008d720c58