pidgin: 100733bf: merge of '592b4775fc1de5871564f3b61637c8...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 100733bff03a2e5b1bbb969d9053e2b8ab366cfc
Ancestor: 592b4775fc1de5871564f3b61637c8f5776a3932
Ancestor: 84f6765b71f2ad2d6c7cddd461114ab5fc758b72
Author: qulogic at pidgin.im
Date: 2009-06-07T08:13:14
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/100733bff03a2e5b1bbb969d9053e2b8ab366cfc

Modified files:
        ChangeLog libpurple/protocols/jabber/buddy.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/notification.h
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msn/userlist.h

ChangeLog: 

merge of '592b4775fc1de5871564f3b61637c8f5776a3932'
     and '84f6765b71f2ad2d6c7cddd461114ab5fc758b72'