pidgin: 743d1ef2: merge of '53053c3093fabd661045da5b90dd26...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 743d1ef23a1a20ef3077a5c282bee5dbfc63e1d2
Ancestor: 53053c3093fabd661045da5b90dd26b37214a73c
Ancestor: 9c7a00da5da4b9502fdf69a36ddf46f4fa5ec353
Author: qulogic at pidgin.im
Date: 2010-05-21T00:49:41
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/743d1ef23a1a20ef3077a5c282bee5dbfc63e1d2

Modified files:
        COPYRIGHT ChangeLog libpurple/protocols/jabber/auth_cyrus.c
        libpurple/protocols/msn/Makefile.am
        libpurple/protocols/msn/Makefile.mingw
        libpurple/protocols/msn/directconn.c
        libpurple/protocols/msn/directconn.h
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/slp.c libpurple/protocols/msn/slp.h
        libpurple/protocols/msn/slpcall.h
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/slplink.h
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/switchboard.c po/he.po

ChangeLog: 

merge of '53053c3093fabd661045da5b90dd26b37214a73c'
     and '9c7a00da5da4b9502fdf69a36ddf46f4fa5ec353'