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

Merge 3.3.
---

b6cc0aad4bb288494a8f8c9f2f501afc9573b910