pidgin: aa75a8b9: merge of '84a23ef59e6a3bc88834f0948c6751...

Wed Jun 3 13:05:26 EDT 2009

-----------------------------------------------------------------
Revision: aa75a8b95f9bc37e78de2c743bb76c343e3ad515
Ancestor: 84a23ef59e6a3bc88834f0948c67516f0a39234b
Ancestor: c6d740f231b3d74f01b3afece4a09e6e4cde36a9
Author: sadrul at pidgin.im
Date: 2009-06-03T17:09:18
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/aa75a8b95f9bc37e78de2c743bb76c343e3ad515

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

ChangeLog: 

merge of '84a23ef59e6a3bc88834f0948c67516f0a39234b'
     and 'c6d740f231b3d74f01b3afece4a09e6e4cde36a9'