pidgin: 5644920b: merge of '520cc89d4197a746c24ce7b030319f...

Tue May 11 16:50:28 EDT 2010

-----------------------------------------------------------------
Revision: 5644920b69ca0205d375d023d32b16772184a02b
Ancestor: 520cc89d4197a746c24ce7b030319f79554352d5
Ancestor: cf862339256f6c319bb59319b3d7bcc3a0fd08e3
Author: qulogic at pidgin.im
Date: 2010-05-11T20:47:33
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5644920b69ca0205d375d023d32b16772184a02b

Modified files:
        NEWS

ChangeLog: 

merge of '520cc89d4197a746c24ce7b030319f79554352d5'
     and 'cf862339256f6c319bb59319b3d7bcc3a0fd08e3'