pidgin: be64dc9c: merge of '4021ee6bbfa81bd2fda8e2760cb4ae...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: be64dc9cd9d255a5a6a0f790f5fc505091313e6d
Ancestor: 4021ee6bbfa81bd2fda8e2760cb4ae05d5c30083
Ancestor: efefbfc4bbf45f2744736df7f5e2ee83c21629f6
Author: qulogic at pidgin.im
Date: 2009-02-15T23:11:18
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/be64dc9cd9d255a5a6a0f790f5fc505091313e6d

Modified files:
        COPYRIGHT ChangeLog finch/libgnt/gntwm.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/msg.c
        libpurple/protocols/msn/msnutils.c
        libpurple/protocols/msn/nexus.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/session.c
        libpurple/protocols/msn/session.h
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/simple/simple.c pidgin/gtkblist.c
        pidgin/gtkconv.c pidgin/pidgintooltip.c

ChangeLog: 

merge of '4021ee6bbfa81bd2fda8e2760cb4ae05d5c30083'
     and 'efefbfc4bbf45f2744736df7f5e2ee83c21629f6'