Fix ChangeLog after merge
authorStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 4 Nov 2010 23:03:10 +0000 (00:03 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 4 Nov 2010 23:03:10 +0000 (00:03 +0100)
commitbbfe77bf4eb6bfbc30f5a02b10f9c5494471803f
treeb2622ac7879e02f86ce7417be565fe676b96a504
parentc371d52f338cd511361e27347af7ff7678ecabc8
Fix ChangeLog after merge
ChangeLog