From: Stefan Krah <skrah@bytereef.org>
Date: Fri, 21 Dec 2012 22:23:25 +0000 (+0100)
Subject: Merge 3.3.
X-Git-Tag: v3.4.0a1~1805
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f31b6035580d0d55dfd42c9f5832d9fb99cff831;p=python

Merge 3.3.
---

f31b6035580d0d55dfd42c9f5832d9fb99cff831