pidgin: 43273141: merge of '8549b9a30115559965e9bf93bb15a4...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 43273141f3984ff94613e8f7c71151febb5c0d91
Ancestor: 8549b9a30115559965e9bf93bb15a45b04c1d149
Ancestor: d1026e37e4b82add833d2a302a41c8f84e4e2bbb
Author: markdoliner at pidgin.im
Date: 2009-12-16T02:43:20
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/43273141f3984ff94613e8f7c71151febb5c0d91

Modified files:
        ChangeLog libpurple/certificate.c libpurple/conversation.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/msn/slp.c libpurple/protocols/msn/slp.h
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/slpcall.h
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/slplink.h
        libpurple/protocols/msn/slpmsg.c
        libpurple/protocols/msn/slpmsg.h
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/myspace/user.c
        libpurple/protocols/myspace/user.h
        libpurple/tests/Makefile.am
        libpurple/tests/check_libpurple.c
        libpurple/tests/test_cipher.c

ChangeLog: 

merge of '8549b9a30115559965e9bf93bb15a45b04c1d149'
     and 'd1026e37e4b82add833d2a302a41c8f84e4e2bbb'