Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Fri, 15 Jul 2011 19:19:27 +0000 (21:19 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Fri, 15 Jul 2011 19:19:27 +0000 (21:19 +0200)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge