pidgin: f2581917: merge of '9448aec0bc0e0168e10e0a3991bfbf...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: f25819178be96dc0eda7c64705152dc16d73dc81
Ancestor: 9448aec0bc0e0168e10e0a3991bfbfe716de6c86
Ancestor: e119afbe9b2dac774c2d26f65883bfd21b226807
Author: sadrul at pidgin.im
Date: 2008-04-24T01:46:38
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f25819178be96dc0eda7c64705152dc16d73dc81

Modified files:
        COPYRIGHT finch/libgnt/gntmain.c libpurple/account.c
        libpurple/log.c libpurple/protocols/msnp9/nexus.c
        libpurple/protocols/msnp9/slplink.c
        libpurple/protocols/msnp9/switchboard.c
        libpurple/protocols/silc/silc.c
        libpurple/protocols/silc10/silc.c pidgin/gtkblist.c
        pidgin/gtkmenutray.c

ChangeLog: 

merge of '9448aec0bc0e0168e10e0a3991bfbfe716de6c86'
     and 'e119afbe9b2dac774c2d26f65883bfd21b226807'