pidgin: 014e8d15: merge of '0fa0d7921af1ea7cb2ce3b4f768354...

Thu Aug 7 15:40:51 EDT 2008

-----------------------------------------------------------------
Revision: 014e8d15032c5d2f61de756436094429827bb9f6
Ancestor: 0fa0d7921af1ea7cb2ce3b4f768354b762110259
Ancestor: a84d29741cb499f1788f9cf39cd33c14b3d440f2
Author: khc at pidgin.im
Date: 2008-08-07T19:36:12
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/014e8d15032c5d2f61de756436094429827bb9f6

Modified files:
        ChangeLog libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/slpcall.h
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/slpmsg.c po/fr.po po/lt.po

ChangeLog: 

merge of '0fa0d7921af1ea7cb2ce3b4f768354b762110259'
     and 'a84d29741cb499f1788f9cf39cd33c14b3d440f2'