pidgin: e7ce81ec: merge of '662b18e22ed66890ffcb81db34c948...

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: e7ce81ec80e34108438ddfb92f78dd948f825e7d
Ancestor: 662b18e22ed66890ffcb81db34c948405b31f4c7
Ancestor: c75212a9281c1a006eb33e70196e493431421b89
Author: deryni at pidgin.im
Date: 2008-02-27T22:41:34
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e7ce81ec80e34108438ddfb92f78dd948f825e7d

Modified files:
        ChangeLog ChangeLog.API libpurple/account.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/family_icq.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h libpurple/server.c
        libpurple/server.h libpurple/tests/Makefile.am
        pidgin/gtkdialogs.c pidgin/gtkmain.c pidgin/pixmaps/logo.png

ChangeLog: 

merge of '662b18e22ed66890ffcb81db34c948405b31f4c7'
     and 'c75212a9281c1a006eb33e70196e493431421b89'