]> granicus.if.org Git - python/commitdiff
merge heads
authorMartin v. Löwis <martin@v.loewis.de>
Mon, 9 Jul 2012 18:51:45 +0000 (20:51 +0200)
committerMartin v. Löwis <martin@v.loewis.de>
Mon, 9 Jul 2012 18:51:45 +0000 (20:51 +0200)

Trivial merge