pidgin: 6fc007db: merge of '054ca20dffd917fc57972d8756d9c1...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 6fc007db8432a45dd3273d0abcc8bb9a09b11ecf
Ancestor: 054ca20dffd917fc57972d8756d9c15ead22fd85
Ancestor: e1bd4479e6211023f43781c3f4864d56fc9bb1b3
Author: darkrain42 at pidgin.im
Date: 2009-06-03T19:34:42
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/6fc007db8432a45dd3273d0abcc8bb9a09b11ecf

Modified files:
        ChangeLog ChangeLog.API libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/msn/msn.c libpurple/util.c
        libpurple/util.h pidgin/gtkconv.c
        pidgin/plugins/convcolors.c

ChangeLog: 

merge of '054ca20dffd917fc57972d8756d9c15ead22fd85'
     and 'e1bd4479e6211023f43781c3f4864d56fc9bb1b3'