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

Null merge.
---

273255fa2f9939c7bee42aa3eb430b3667033ecb