From: Stefan Krah <skrah@bytereef.org>
Date: Wed, 29 May 2013 13:47:24 +0000 (+0200)
Subject: Merge 3.3.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8d90e383a3517a13d752625231584967397d8ba2;p=python

Merge 3.3.
---

8d90e383a3517a13d752625231584967397d8ba2