From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 30 Jul 2013 18:09:36 +0000 (+0200)
Subject: Merge doc fix
X-Git-Tag: v3.4.0a1~40
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8547a0e29be7c16bb3d45077f1e95bf7ba313a77;p=python

Merge doc fix
---

8547a0e29be7c16bb3d45077f1e95bf7ba313a77