pidgin: 17fcb3e7: merge of '52fb5cb4cd8795906a7313dd5edde7...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 17fcb3e7ac74579122bb5259359cef56f5bbf713
Ancestor: 52fb5cb4cd8795906a7313dd5edde763a4848a3e
Ancestor: 884d44222e8c81ecec51c25e07d005e002a5479b
Author: qulogic at pidgin.im
Date: 2010-05-12T05:15:44
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/17fcb3e7ac74579122bb5259359cef56f5bbf713

Modified files:
        libpurple/protocols/gg/Makefile.am
        libpurple/protocols/msn/slplink.c
        libpurple/tests/check_libpurple.c

ChangeLog: 

merge of '52fb5cb4cd8795906a7313dd5edde763a4848a3e'
     and '884d44222e8c81ecec51c25e07d005e002a5479b'