pidgin: 69e3f185: merge of 'a20a45414d71cd9c0ab697cf0d6209...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 69e3f1859964483e117264088d4b6fc214709f6a
Ancestor: a20a45414d71cd9c0ab697cf0d6209bea8d9140c
Ancestor: cde2d2ed1c69105e71b77c426cb80f3281163065
Author: maiku at soc.pidgin.im
Date: 2009-07-31T04:21:28
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/69e3f1859964483e117264088d4b6fc214709f6a

Modified files:
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slpcall.c
        pidgin/win32/nsis/pidgin-installer.nsi

ChangeLog: 

merge of 'a20a45414d71cd9c0ab697cf0d6209bea8d9140c'
     and 'cde2d2ed1c69105e71b77c426cb80f3281163065'