pidgin: 0c7cfe99: merge of '8c40d658dc534ac7ccbf595c73c295...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 0c7cfe99ca83a1d8e6ef18d225db62eab6ea13a8
Ancestor: 8c40d658dc534ac7ccbf595c73c2952ff9d1975e
Ancestor: f437e9068c55a8150ca5037abe618c39190b60c0
Author: sadrul at pidgin.im
Date: 2008-05-04T02:49:29
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/0c7cfe99ca83a1d8e6ef18d225db62eab6ea13a8

Modified files:
        ChangeLog finch/gntblist.c libpurple/log.c
        libpurple/plugins/log_reader.c
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/dialog.c
        libpurple/protocols/msn/nexus.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/oim.c libpurple/protocols/msn/page.c
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/slpmsg.c
        libpurple/protocols/msn/soap2.c
        libpurple/protocols/msn/sync.c
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/yahoo/yahoo_aliases.h
        libpurple/protocols/yahoo/yahoo_friend.c
        libpurple/protocols/yahoo/yahoo_friend.h pidgin/gtkaccount.c
        pidgin/gtkprefs.c

ChangeLog: 

merge of '8c40d658dc534ac7ccbf595c73c2952ff9d1975e'
     and 'f437e9068c55a8150ca5037abe618c39190b60c0'