diff ChangeLog @ 20651:c1b559a2610f

merge of '31d62e1a78974a0239e86bfeb42b29ab75216114' and '9ac69ea809d7739080783dc7f3de14cfcf9325d3'
author Luke Schierer <lschiere@pidgin.im>
date Mon, 24 Sep 2007 12:14:42 +0000
parents 54ff514fdd04
children 59043d445d1b
line wrap: on
line diff