im.pidgin.pidgin: 1c0e001dd7982814ff7749e6cb13321d9a096a25

[jeff2 at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 1c0e001dd7982814ff7749e6cb13321d9a096a25
Ancestor: 127e166396532169c471488d7be34927a0f32b39
Ancestor: b75a11995dcb2d3d2dc04522842a884fa0b5d06f
Author: jeff2 at soc.pidgin.im
Date: 2008-02-04T04:04:02
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1c0e001dd7982814ff7749e6cb13321d9a096a25

Added files:
        finch/gntlog.c finch/gntlog.h
Modified files:
        ChangeLog ChangeLog.API finch/Makefile.am finch/gntaccount.c
        finch/gntblist.c finch/gntcertmgr.c finch/gntconv.c
        finch/gntpounce.c finch/gntui.c finch/libgnt/gnttree.c
        finch/libgnt/gnttree.h libpurple/account.c libpurple/blist.c
        libpurple/buddyicon.c libpurple/conversation.c
        libpurple/privacy.c libpurple/protocols/msn/msn.c
        libpurple/protocols/msnp9/msn.c
        libpurple/protocols/msnp9/notification.c
        libpurple/protocols/msnp9/session.c
        libpurple/protocols/msnp9/sync.c
        libpurple/protocols/msnp9/user.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/user.c
        libpurple/protocols/qq/login_logout.c
        libpurple/protocols/silc10/ops.c
        libpurple/protocols/silc10/silc.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo.h
        libpurple/protocols/yahoo/yahoochat.c
        libpurple/protocols/zephyr/zephyr.c libpurple/roomlist.c
        libpurple/server.c libpurple/status.c libpurple/whiteboard.c
        pidgin/gtkaccount.c pidgin/gtkcertmgr.c pidgin/gtklog.c
        pidgin/gtkprivacy.c pidgin/pidgintooltip.h po/POTFILES.in

ChangeLog: 

merge of '127e166396532169c471488d7be34927a0f32b39'
     and 'b75a11995dcb2d3d2dc04522842a884fa0b5d06f'