diff ChangeLog @ 32129:0e94b0815349

This looks like a merge error. Fix it.
author masca@cpw.pidgin.im
date Wed, 07 Sep 2011 04:57:34 +0000
parents d82c76a842f8
children 44fc11beefab
line wrap: on
line diff