]> granicus.if.org Git - python/commitdiff
Merge
authorMartin v. Löwis <martin@v.loewis.de>
Tue, 26 Jun 2012 07:19:48 +0000 (09:19 +0200)
committerMartin v. Löwis <martin@v.loewis.de>
Tue, 26 Jun 2012 07:19:48 +0000 (09:19 +0200)

Trivial merge