diff ChangeLog @ 32113:4b53d875529f

fixed conflicts in previous merge.
author tdrhq@soc.pidgin.im
date Wed, 26 Aug 2009 03:19:30 +0000
parents b357216b7b79
children 092659955afb
line wrap: on
line diff