]> granicus.if.org Git - python/commitdiff
Branch merge
authorÉric Araujo <merwok@netwok.org>
Fri, 29 Jul 2011 12:24:08 +0000 (14:24 +0200)
committerÉric Araujo <merwok@netwok.org>
Fri, 29 Jul 2011 12:24:08 +0000 (14:24 +0200)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge