pidgin: 58b2ba10: merge of '1890ad1259c93f5ad18ceb3365717e...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 58b2ba106e563fcd0984b9438aa427f1d61e25e9
Ancestor: 1890ad1259c93f5ad18ceb3365717ebc43b30198
Ancestor: b28028a0f1c19eaf4ee7d941c83b587980320568
Author: maiku at soc.pidgin.im
Date: 2009-04-04T02:55:39
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/58b2ba106e563fcd0984b9438aa427f1d61e25e9

Modified files:
        ChangeLog.API libpurple/network.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jingle/rtp.c

ChangeLog: 

merge of '1890ad1259c93f5ad18ceb3365717ebc43b30198'
     and 'b28028a0f1c19eaf4ee7d941c83b587980320568'