]> granicus.if.org Git - python/commitdiff
Merge 3.1
authorÉric Araujo <merwok@netwok.org>
Thu, 26 May 2011 14:50:31 +0000 (16:50 +0200)
committerÉric Araujo <merwok@netwok.org>
Thu, 26 May 2011 14:50:31 +0000 (16:50 +0200)

Trivial merge