pidgin: 0f322f08: merge of '752623f68962a90397d0ac88cfa20f...

Mon Oct 19 19:02:26 EDT 2009

-----------------------------------------------------------------
Revision: 0f322f0889f33c4f6785705eb2f79a676a4e56b2
Ancestor: 752623f68962a90397d0ac88cfa20f7435e704aa
Ancestor: e8f9d9be93f38aa597367b8f9bbb6322995e5ff3
Author: darkrain42 at pidgin.im
Date: 2009-10-19T22:56:57
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/0f322f0889f33c4f6785705eb2f79a676a4e56b2

Modified files:
        ChangeLog libpurple/media.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/message.c pidgin/gtkmedia.c
        pidgin/gtkroomlist.c pidgin/gtkutils.c
        pidgin/plugins/disco/gtkdisco.c

ChangeLog: 

merge of '752623f68962a90397d0ac88cfa20f7435e704aa'
     and 'e8f9d9be93f38aa597367b8f9bbb6322995e5ff3'