pidgin: 5b55f7c6: merge of '0818f22621a06fa5a61bba3d4a10de...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 5b55f7c6ba5c3a07e85fbc2cd0370a411c7c70db
Ancestor: 0818f22621a06fa5a61bba3d4a10de1e42813cfa
Ancestor: 4b9ca13f2987492c10363d58816d0a2e5bdee54c
Author: darkrain42 at pidgin.im
Date: 2009-10-09T01:39:41
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5b55f7c6ba5c3a07e85fbc2cd0370a411c7c70db

Modified files:
        finch/libgnt/gntbox.c finch/libgnt/gnttextview.c
        finch/plugins/gnttinyurl.c libpurple/account.c
        libpurple/plugins/perl/common/Prpl.xs
        libpurple/plugins/perl/perl.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/nexus.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/oim.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/servconn.h

ChangeLog: 

merge of '0818f22621a06fa5a61bba3d4a10de1e42813cfa'
     and '4b9ca13f2987492c10363d58816d0a2e5bdee54c'