pidgin: 4ba10f02: merge of '1696adf9dd410d4b67f782058165fb...

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: 4ba10f028ed5e73f7fe9f00b3131844819ed85a6
Ancestor: 1696adf9dd410d4b67f782058165fbf61cb53c61
Ancestor: 690c7c4a76e71e487456cfb56e90f63a76e5d1c7
Author: deryni at pidgin.im
Date: 2009-05-20T01:09:04
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4ba10f028ed5e73f7fe9f00b3131844819ed85a6

Modified files:
        ChangeLog doc/notify-signals.dox libpurple/account.c
        libpurple/buddyicon.h libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/ping.c
        libpurple/protocols/jabber/ping.h
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/user.c
        libpurple/protocols/msn/user.h
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msn/userlist.h
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h libpurple/prpl.h
        pidgin/gtkconv.c

ChangeLog: 

merge of '1696adf9dd410d4b67f782058165fbf61cb53c61'
     and '690c7c4a76e71e487456cfb56e90f63a76e5d1c7'