From: Stefan Krah <skrah@bytereef.org>
Date: Sun, 18 Nov 2012 23:54:50 +0000 (+0100)
Subject: Null merge.
X-Git-Tag: v3.4.0a1~1976
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cbb3fa26469737428d33b730d15e4a840d0d6c8d;p=python

Null merge.
---

cbb3fa26469737428d33b730d15e4a840d0d6c8d