news: fix botched merges, some cleanups
commite0f4e162fc62a53a8843a0b1c60ee24ac505699e
authorStefano Lattarini <stefano.lattarini@gmail.com>
Sun, 18 Mar 2012 19:23:33 +0000 (18 20:23 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Sun, 18 Mar 2012 19:24:31 +0000 (18 20:24 +0100)
treef5cffff8827996a69817bef8bd979f08d098f265
parent82b05b707f6f21ccc09c703582ede5987d2b5fce
news: fix botched merges, some cleanups

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
NEWS