pidgin: b0b99c2b: merge of '27f7d38af8dba617aba8109d82e279...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: b0b99c2ba66c763b9d7ce0fe7a85bda8c2e56834
Ancestor: 27f7d38af8dba617aba8109d82e27907cd7d8b41
Ancestor: a712e9bb2bed4b456e81ad7236c65b4ad8eab69a
Author: datallah at pidgin.im
Date: 2008-10-21T16:16:40
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b0b99c2ba66c763b9d7ce0fe7a85bda8c2e56834

Modified files:
        libpurple/proxy.c libpurple/util.c pidgin/gtkdialogs.c
        pidgin.spec.in

ChangeLog: 

merge of '27f7d38af8dba617aba8109d82e27907cd7d8b41'
     and 'a712e9bb2bed4b456e81ad7236c65b4ad8eab69a'