pidgin.vv: 22553645: merge of 'd47b8ff41e04be89d7152ac8f587e6...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 22553645a6b7273105d6333de2a0cec0f32b8478
Ancestor: d47b8ff41e04be89d7152ac8f587e633fff7c1cb
Ancestor: e6e2272c5b1e49a6ee2565437cd3d6b8963085c9
Author: maiku at soc.pidgin.im
Date: 2009-02-19T11:28:01
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/22553645a6b7273105d6333de2a0cec0f32b8478

Modified files:
        libpurple/media.c libpurple/media.h libpurple/mediamanager.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jingle/jingle.h
        libpurple/protocols/jabber/libxmpp.c libpurple/prpl.c
        libpurple/prpl.h pidgin/gtkblist.c pidgin/gtkconv.c

ChangeLog: 

merge of 'd47b8ff41e04be89d7152ac8f587e633fff7c1cb'
     and 'e6e2272c5b1e49a6ee2565437cd3d6b8963085c9'