pidgin: 1f2555d9: merge of '26606a5b2701a5b005448d15da254e...

[khc at pidgin.im]

-----------------------------------------------------------------
Revision: 1f2555d955dc18eae653a47dafaf1235881772aa
Ancestor: 26606a5b2701a5b005448d15da254ecd796a005d
Ancestor: 8712565242226521bcae659debc6fdc1ceb03eaa
Author: khc at pidgin.im
Date: 2008-08-08T06:47:34
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1f2555d955dc18eae653a47dafaf1235881772aa

Modified files:
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/oim.c
        libpurple/protocols/msn/session.c
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msnp9/slpcall.c
        libpurple/protocols/msnp9/slpcall.h
        libpurple/protocols/msnp9/slplink.c libpurple/util.c
        po/lt.po

ChangeLog: 

merge of '26606a5b2701a5b005448d15da254ecd796a005d'
     and '8712565242226521bcae659debc6fdc1ceb03eaa'