diff ChangeLog @ 21500:c6834071f6c5

merge of '1e67d8385e25c7400a4100b8af1048dd5c0a3f0f' and '77ab949e0925a5edfc71240de20bb2a117c01ca7'
author Luke Schierer <lschiere@pidgin.im>
date Wed, 14 Nov 2007 12:47:33 +0000
parents d8106b63b0a4
children dde2859a3225
line wrap: on
line diff