pidgin: 58f8b2b3: merge of '9af1b5054f770dc244dcad8b55bdb6...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 58f8b2b331075660bb2f57e5dc82b32e039f8099
Ancestor: 9af1b5054f770dc244dcad8b55bdb61c0f3347a4
Ancestor: ac620b61f3dbe3da2184888eb05a0f637c3cd245
Author: datallah at pidgin.im
Date: 2008-10-27T00:17:33
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/58f8b2b331075660bb2f57e5dc82b32e039f8099

Modified files:
        libpurple/protocols/jabber/iq.c libpurple/server.c

ChangeLog: 

merge of '9af1b5054f770dc244dcad8b55bdb61c0f3347a4'
     and 'ac620b61f3dbe3da2184888eb05a0f637c3cd245'