pidgin: 90547952: merge of '263b34adf7373694b48a494714d668...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 90547952037cf18eeca9185d175f6f326d2c30d1
Ancestor: 263b34adf7373694b48a494714d66824d6bb3443
Ancestor: d6f80b7ba5ba2da4ae203eac6f07565721b10ad8
Author: darkrain42 at pidgin.im
Date: 2009-11-29T17:32:05
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/90547952037cf18eeca9185d175f6f326d2c30d1

Modified files:
        ChangeLog libpurple/dbus-server.c
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/namespaces.h
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/mxit/chunk.c
        libpurple/protocols/mxit/chunk.h
        libpurple/protocols/mxit/formcmds.c
        libpurple/protocols/mxit/markup.c
        libpurple/protocols/mxit/mxit.c
        libpurple/protocols/mxit/mxit.h
        libpurple/protocols/mxit/protocol.c
        libpurple/protocols/mxit/roster.c
        libpurple/protocols/mxit/splashscreen.c
        libpurple/protocols/oscar/oscar.c libpurple/proxy.c
        pidgin/gtkconv.c po/ca.po po/fr.po

ChangeLog: 

merge of '263b34adf7373694b48a494714d66824d6bb3443'
     and 'd6f80b7ba5ba2da4ae203eac6f07565721b10ad8'