pidgin: 2a3e8017: merge of '7f93eb293109127d6a055f9a6aaa8b...

Thu Feb 4 00:45:38 EST 2010

-----------------------------------------------------------------
Revision: 2a3e80170374775648865ed02009fb9e8b2c8799
Ancestor: 7f93eb293109127d6a055f9a6aaa8baaa85207d1
Ancestor: 9028ac0daaa1f7e565726fa39aca22ce7d3ecc49
Author: sadrul at pidgin.im
Date: 2010-02-04T05:46:37
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2a3e80170374775648865ed02009fb9e8b2c8799

Modified files:
        ChangeLog libpurple/media.c libpurple/prefs.h
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/jabber/data.h
        libpurple/protocols/jabber/message.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/state.h
        libpurple/protocols/msn/user.c
        libpurple/protocols/msn/user.h
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msn/userlist.h
        libpurple/protocols/myspace/user.c
        libpurple/protocols/oscar/libaim.c pidgin/gtkconv.c
        pidgin/gtkdebug.c pidgin/gtkimhtml.c

ChangeLog: 

merge of '7f93eb293109127d6a055f9a6aaa8baaa85207d1'
     and '9028ac0daaa1f7e565726fa39aca22ce7d3ecc49'