From: Stefan Krah <skrah@bytereef.org>
Date: Sun, 30 Sep 2012 19:28:46 +0000 (+0200)
Subject: Null merge.
X-Git-Tag: v3.4.0a1~2435
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c94095f23202d5b2bca1c4108677b311e4e076c5;p=python

Null merge.
---

c94095f23202d5b2bca1c4108677b311e4e076c5