pidgin: 5209711a: merge of '3a93d6a9f17c32fb5379bb3f229439...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 5209711a57354bb80c0bca86b13e1e819530ac58
Ancestor: 3a93d6a9f17c32fb5379bb3f2294392fac142b92
Ancestor: 6258290c16427985f40258a4ca1be4e11feafc33
Author: markdoliner at pidgin.im
Date: 2008-06-16T01:03:23
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5209711a57354bb80c0bca86b13e1e819530ac58

Modified files:
        libpurple/blist.h libpurple/cmds.h libpurple/connection.h
        libpurple/conversation.h libpurple/core.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/si.h
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/simple/simple.c libpurple/prpl.h
        libpurple/roomlist.h libpurple/sound.h libpurple/util.c

ChangeLog: 

merge of '3a93d6a9f17c32fb5379bb3f2294392fac142b92'
     and '6258290c16427985f40258a4ca1be4e11feafc33'