pidgin: a486f243: merge of '8298236e9cd6a6127656eacf513bc6...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: a486f2434bfdc4b53ace6341378dd4f1ff6a7f03
Ancestor: 8298236e9cd6a6127656eacf513bc6928bee9065
Ancestor: f75666909dcf5a84177e1cc50025f197341650f1
Author: qulogic at pidgin.im
Date: 2008-11-23T04:06:45
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a486f2434bfdc4b53ace6341378dd4f1ff6a7f03

Modified files:
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/sametime/sametime.c

ChangeLog: 

merge of '8298236e9cd6a6127656eacf513bc6928bee9065'
     and 'f75666909dcf5a84177e1cc50025f197341650f1'