pidgin: 834ee180: merge of '90da8da01d8b8fa432adae5fd697ef...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 834ee1803fbad0f4960a66592ac43641f23124c6
Ancestor: 90da8da01d8b8fa432adae5fd697ef4bad3582b5
Ancestor: f5644cc4891cdcc46fafcec5127d00e48aa48e22
Author: qulogic at pidgin.im
Date: 2009-07-11T07:02:33
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/834ee1803fbad0f4960a66592ac43641f23124c6

Modified files:
        ChangeLog configure.ac finch/gntconv.c libpurple/internal.h
        libpurple/plugins/ssl/ssl-nss.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/msn.h
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/slpmsg.c
        libpurple/protocols/msn/slpmsg.h
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msnp9/command.c
        libpurple/protocols/oscar/clientlogin.c
        libpurple/protocols/qq/buddy_opt.c
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/libymsg.h
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/yahoo/yahoo_aliases.h
        libpurple/protocols/yahoo/yahoo_friend.h
        libpurple/protocols/yahoo/yahoo_packet.c
        libpurple/tests/test_jabber_jutil.c
        libpurple/tests/test_util.c libpurple/util.c
        pidgin/gtkconv.c pidgin/gtkutils.c
        pidgin/plugins/gevolution/add_buddy_dialog.c
        pidgin/plugins/gevolution/assoc-buddy.c
        pidgin/plugins/gevolution/eds-utils.c
        pidgin/plugins/gevolution/gevo-util.c
        pidgin/plugins/gevolution/gevolution.c po/POTFILES.in

ChangeLog: 

merge of '90da8da01d8b8fa432adae5fd697ef4bad3582b5'
     and 'f5644cc4891cdcc46fafcec5127d00e48aa48e22'