pidgin: 8e913dbf: merge of '834b032b518f6b4ab9148b946ca635...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 8e913dbf7769c29f608bfe083b39c8bcb9fbede4
Ancestor: 834b032b518f6b4ab9148b946ca635214a9388d8
Ancestor: fd954d6a415456dce86aa9443b24e1df25019bd7
Author: qulogic at pidgin.im
Date: 2008-12-10T06:58:10
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8e913dbf7769c29f608bfe083b39c8bcb9fbede4

Modified files:
        ChangeLog ChangeLog.win32
        libpurple/protocols/bonjour/bonjour_ft.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/yahoo/yahoo_aliases.c
        libpurple/protocols/yahoo/yahoo_profile.c
        libpurple/win32/global.mak

ChangeLog: 

merge of '834b032b518f6b4ab9148b946ca635214a9388d8'
     and 'fd954d6a415456dce86aa9443b24e1df25019bd7'