pidgin: b5086a02: merge of '8995bf8c14c5b7fb67a84a18ba9bf7...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: b5086a027dfbc0926b74627b9783794d250c2cb4
Ancestor: 8995bf8c14c5b7fb67a84a18ba9bf73e7be3fca8
Ancestor: c8c73a03615c9761cd104c6e2c8de12d1c8a82ac
Author: qulogic at pidgin.im
Date: 2010-05-11T06:32:00
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b5086a027dfbc0926b74627b9783794d250c2cb4

Added files:
        po/as.po po/ml.po
Modified files:
        COPYRIGHT ChangeLog libpurple/network.h
        libpurple/protocols/msn/Makefile.am
        libpurple/protocols/msn/Makefile.mingw
        libpurple/protocols/msn/directconn.c
        libpurple/protocols/msn/directconn.h
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/msn.h
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/slp.c libpurple/protocols/msn/slp.h
        libpurple/protocols/msn/slpcall.h
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/slplink.h
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/switchboard.c libpurple/prpl.h
        pidgin/gtkdialogs.c po/ChangeLog po/af.po po/bn.po po/ca.po
        po/cs.po po/de.po po/hu.po po/it.po po/mr.po po/nn.po
        po/pl.po po/ro.po po/sk.po po/sl.po po/sq.po po/uk.po
        po/zh_HK.po po/zh_TW.po

ChangeLog: 

merge of '8995bf8c14c5b7fb67a84a18ba9bf73e7be3fca8'
     and 'c8c73a03615c9761cd104c6e2c8de12d1c8a82ac'