pidgin: 34496060: merge of '25555f057b156444048f1b2fafeeaf...

[paul at darkrain42.org]

-----------------------------------------------------------------
Revision: 3449606003214557c0211a2c05eb93c33b5ddc86
Ancestor: 25555f057b156444048f1b2fafeeaf056ac0be9c
Ancestor: d5e7052bece6d95db1b6140e42375092f9da589b
Author: paul at darkrain42.org
Date: 2009-02-27T07:28:04
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3449606003214557c0211a2c05eb93c33b5ddc86

Modified files:
        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 po/ChangeLog po/af.po
        po/da.po po/nb.po po/pa.po po/pt_BR.po po/zh_HK.po
        po/zh_TW.po

ChangeLog: 

merge of '25555f057b156444048f1b2fafeeaf056ac0be9c'
     and 'd5e7052bece6d95db1b6140e42375092f9da589b'