]> granicus.if.org Git - python/commitdiff
Branch merge
authorÉric Araujo <merwok@netwok.org>
Thu, 3 Nov 2011 15:27:57 +0000 (16:27 +0100)
committerÉric Araujo <merwok@netwok.org>
Thu, 3 Nov 2011 15:27:57 +0000 (16:27 +0100)

Trivial merge