]> granicus.if.org Git - python/commitdiff
Merge heads
authorMartin v. Löwis <martin@v.loewis.de>
Fri, 22 Jun 2012 20:19:51 +0000 (22:19 +0200)
committerMartin v. Löwis <martin@v.loewis.de>
Fri, 22 Jun 2012 20:19:51 +0000 (22:19 +0200)

Trivial merge