]> granicus.if.org Git - python/commitdiff
merge heads
authorMatthias Klose <doko@ubuntu.com>
Wed, 14 Mar 2012 22:26:26 +0000 (23:26 +0100)
committerMatthias Klose <doko@ubuntu.com>
Wed, 14 Mar 2012 22:26:26 +0000 (23:26 +0100)

Trivial merge