]> granicus.if.org Git - python/commitdiff
Branch merge
authorÉric Araujo <merwok@netwok.org>
Sun, 24 Jun 2012 17:54:22 +0000 (13:54 -0400)
committerÉric Araujo <merwok@netwok.org>
Sun, 24 Jun 2012 17:54:22 +0000 (13:54 -0400)

Trivial merge