]> granicus.if.org Git - python/commitdiff
Merge sphinx changes
authorMartin v. Löwis <martin@v.loewis.de>
Tue, 1 May 2012 16:15:13 +0000 (18:15 +0200)
committerMartin v. Löwis <martin@v.loewis.de>
Tue, 1 May 2012 16:15:13 +0000 (18:15 +0200)

Trivial merge