]> granicus.if.org Git - python/commitdiff
Branch merge
authorÉric Araujo <merwok@netwok.org>
Wed, 19 Oct 2011 19:32:39 +0000 (21:32 +0200)
committerÉric Araujo <merwok@netwok.org>
Wed, 19 Oct 2011 19:32:39 +0000 (21:32 +0200)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge