pidgin: 8175c2ee: merge of '103b421151d9a077e40a662e8d3743...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 8175c2ee59e9bd061677485b8842189f58028ed1
Ancestor: 103b421151d9a077e40a662e8d3743b5232f3da4
Ancestor: acfad3317f67456bc14db0041b24cf422cfa18e6
Author: qulogic at pidgin.im
Date: 2008-08-12T04:37:18
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8175c2ee59e9bd061677485b8842189f58028ed1

Modified files:
        libpurple/protocols/jabber/caps.c
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/directconn.c
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/nexus.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/transaction.h
        libpurple/protocols/msnp9/msn.c
        libpurple/protocols/myspace/zap.c
        libpurple/protocols/yahoo/yahoo.c po/de.po po/fi.po

ChangeLog: 

merge of '103b421151d9a077e40a662e8d3743b5232f3da4'
     and 'acfad3317f67456bc14db0041b24cf422cfa18e6'