pidgin: aacbe077: merge of '46d5666420acffd7b3464e1c2ba0b5...

Tue Aug 4 00:05:27 EDT 2009

-----------------------------------------------------------------
Revision: aacbe07782ea562b3fd3b7cd615f22041e73f3e6
Ancestor: 46d5666420acffd7b3464e1c2ba0b5d0711c514d
Ancestor: ddd409ab5c5ab662714e99acac638173c11bc8be
Author: darkrain42 at pidgin.im
Date: 2009-08-04T04:04:21
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/aacbe07782ea562b3fd3b7cd615f22041e73f3e6

Modified files:
        libpurple/certificate.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

ChangeLog: 

merge of '46d5666420acffd7b3464e1c2ba0b5d0711c514d'
     and 'ddd409ab5c5ab662714e99acac638173c11bc8be'