pidgin: 353dca4b: merge of '8abde19f1f7825af2ea2d62b7a00e1...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 353dca4bdccf7f7494fbffa5503b6641c0f6e758
Ancestor: 8abde19f1f7825af2ea2d62b7a00e1de7afd6492
Ancestor: 9af1b5054f770dc244dcad8b55bdb61c0f3347a4
Author: nosnilmot at pidgin.im
Date: 2008-10-27T00:57:04
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/353dca4bdccf7f7494fbffa5503b6641c0f6e758

Modified files:
        Makefile.am NEWS libpurple/protocols/jabber/iq.c
        libpurple/server.c pidgin/gtkdialogs.c

ChangeLog: 

merge of '8abde19f1f7825af2ea2d62b7a00e1de7afd6492'
     and '9af1b5054f770dc244dcad8b55bdb61c0f3347a4'