pidgin: 46d56664: merge of '4687f2ad1aa97d621e389533af5370...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 46d5666420acffd7b3464e1c2ba0b5d0711c514d
Ancestor: 4687f2ad1aa97d621e389533af53704e6066f35a
Ancestor: de6bbf227459900b7451907360f092dfb33df8d6
Author: qulogic at pidgin.im
Date: 2009-08-04T03:52:57
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/46d5666420acffd7b3464e1c2ba0b5d0711c514d

Modified files:
        ChangeLog finch/gntblist.c libpurple/connection.c
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/yahoo/util.c
        libpurple/tests/test_yahoo_util.c libpurple/xmlnode.h
        pidgin/gtkstatusbox.c po/ChangeLog po/es.po po/sl.po

ChangeLog: 

merge of '4687f2ad1aa97d621e389533af53704e6066f35a'
     and 'de6bbf227459900b7451907360f092dfb33df8d6'