pidgin: fb0e9217: merge of 'abdecd59fbf18da0d4f391df390910...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: fb0e9217da1d198efe214766b21e0152c6a17380
Ancestor: abdecd59fbf18da0d4f391df390910b525356ffb
Ancestor: f005961acc673854916055d8bc491c28f9fb63f0
Author: darkrain42 at pidgin.im
Date: 2009-08-13T03:28:38
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/fb0e9217da1d198efe214766b21e0152c6a17380

Modified files:
        libpurple/ft.c libpurple/ft.h libpurple/media.c
        libpurple/mediamanager.c libpurple/pounce.c
        libpurple/prefs.c libpurple/protocols/msn/cmdproc.c
        libpurple/protocols/msn/directconn.c
        libpurple/protocols/msn/session.h
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/slpmsg.h
        libpurple/protocols/msn/sync.h
        libpurple/protocols/msn/userlist.h
        libpurple/protocols/myspace/myspace.c libpurple/proxy.c
        libpurple/savedstatuses.c libpurple/status.c
        pidgin/gtkdialogs.c po/ChangeLog po/ro.po

ChangeLog: 

merge of 'abdecd59fbf18da0d4f391df390910b525356ffb'
     and 'f005961acc673854916055d8bc491c28f9fb63f0'