pidgin: de756219: merge of '20320727f6c8f5a4a4b7b8c0f65c74...

[maiku at pidgin.im]

-----------------------------------------------------------------
Revision: de756219d6c0b43445596e8b6a82fa5b6edd18ff
Ancestor: 20320727f6c8f5a4a4b7b8c0f65c74a57ada1e15
Ancestor: 693f34aeef5794c9381068260ba79c542090e3fb
Author: maiku at pidgin.im
Date: 2009-08-13T07:28:12
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/de756219d6c0b43445596e8b6a82fa5b6edd18ff

Modified files:
        libpurple/ft.c libpurple/media.c libpurple/mediamanager.c
        libpurple/pounce.c libpurple/prefs.c
        libpurple/protocols/jabber/jingle/rtp.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 pidgin/gtkmedia.c po/ChangeLog po/ro.po

ChangeLog: 

merge of '20320727f6c8f5a4a4b7b8c0f65c74a57ada1e15'
     and '693f34aeef5794c9381068260ba79c542090e3fb'