pidgin: e9d34ab5: merge of '204f0197379cadffd6cea25efa6e2c...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: e9d34ab5e47f22b35fd2d69d61a2c943cc0653db
Ancestor: 204f0197379cadffd6cea25efa6e2cdeae1a3bc5
Ancestor: a2a9e1db2545692a99d8d962fd05de135f570cad
Author: qulogic at pidgin.im
Date: 2010-02-18T06:20:55
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e9d34ab5e47f22b35fd2d69d61a2c943cc0653db

Modified files:
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/chat.h
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/msn/notification.c

ChangeLog: 

merge of '204f0197379cadffd6cea25efa6e2cdeae1a3bc5'
     and 'a2a9e1db2545692a99d8d962fd05de135f570cad'