pidgin: c294c738: merge of '8955da011b0481f0598f9cb0ee24fc...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: c294c73896eeb961ca95b1e2f3d212056de7a8a5
Ancestor: 8955da011b0481f0598f9cb0ee24fc2184396c69
Ancestor: 94fa017925fa206fc36f520ee42c54f57429b4e1
Author: darkrain42 at pidgin.im
Date: 2010-05-29T00:16:30
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c294c73896eeb961ca95b1e2f3d212056de7a8a5

Modified files:
        libpurple/protocols/msn/directconn.c
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slplink.c libpurple/roomlist.h

ChangeLog: 

merge of '8955da011b0481f0598f9cb0ee24fc2184396c69'
     and '94fa017925fa206fc36f520ee42c54f57429b4e1'