pidgin: f7566690: merge of '98fe04f817ef415faebd3f7a38b7f0...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: f75666909dcf5a84177e1cc50025f197341650f1
Ancestor: 98fe04f817ef415faebd3f7a38b7f0588c0b0cba
Ancestor: ac5ad8696557cce639dfde7b224efbc5dbf48dde
Author: qulogic at pidgin.im
Date: 2008-11-23T04:06:43
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f75666909dcf5a84177e1cc50025f197341650f1

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

ChangeLog: 

merge of '98fe04f817ef415faebd3f7a38b7f0588c0b0cba'
     and 'ac5ad8696557cce639dfde7b224efbc5dbf48dde'