im.pidgin.pidgin: 22ecd7ea1376fa3c0d66294bbd70904410837ede

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 22ecd7ea1376fa3c0d66294bbd70904410837ede
Ancestor: 624a8a3a5fd07708e24e8238a0d745c857ca9c72
Ancestor: 9d0fba0e0edc763a880b7b5261ae1023f340c97b
Author: datallah at pidgin.im
Date: 2007-10-26T05:07:17
Branch: im.pidgin.pidgin

Modified files:
        libpurple/cipher.c libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/bonjour/mdns_win32.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/usermood.c
        libpurple/protocols/oscar/oscar.c libpurple/proxy.c
        libpurple/util.c pidgin/gtkcertmgr.c pidgin/gtkdebug.c
        pidgin/gtkdialogs.c pidgin/gtkimhtml.c pidgin/gtkmain.c
        pidgin/gtknickcolors.h pidgin/gtkprefs.c pidgin/gtkprivacy.c
        pidgin/gtksound.c

ChangeLog: 

merge of '624a8a3a5fd07708e24e8238a0d745c857ca9c72'
     and '9d0fba0e0edc763a880b7b5261ae1023f340c97b'