pidgin: 1091ca6d: merge of '2d203a89c855916b5c37a95cc1869c...

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 1091ca6d6495d97528486b4c0d29164fc8397ce6
Ancestor: 2d203a89c855916b5c37a95cc1869c15b24f812c
Ancestor: 81aa401ac9855c99eb55a7cf91fa221860dee220
Author: rlaager at pidgin.im
Date: 2008-12-11T03:31:16
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1091ca6d6495d97528486b4c0d29164fc8397ce6

Modified files:
        ChangeLog ChangeLog.win32
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/bonjour/bonjour_ft.c
        libpurple/protocols/bonjour/buddy.c
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/bonjour/jabber.h
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/msn.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/myspace/user.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/group_join.c
        libpurple/protocols/qq/qq_base.c
        libpurple/protocols/qq/qq_process.c
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/yahoo/yahoo_profile.c
        libpurple/win32/global.mak

ChangeLog: 

merge of '2d203a89c855916b5c37a95cc1869c15b24f812c'
     and '81aa401ac9855c99eb55a7cf91fa221860dee220'