pidgin: be77df48: merge of '20a2cebedc53676ed04bba9375a4e5...

Tue Feb 16 10:24:15 EST 2010

-----------------------------------------------------------------
Revision: be77df4826034ac2521177bb6af6b60be3d1b4c4
Ancestor: 20a2cebedc53676ed04bba9375a4e5a9cd97b6fd
Ancestor: c0adc68d6e21c013beb36f789a05d94234c3696a
Author: darkrain42 at pidgin.im
Date: 2010-02-16T15:16:28
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/be77df4826034ac2521177bb6af6b60be3d1b4c4

Modified files:
        ChangeLog libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/jabber/roster.c pidgin/gtkimhtml.c
        pidgin/gtkprefs.c po/ChangeLog po/he.po po/sk.po po/zh_HK.po
        po/zh_TW.po

ChangeLog: 

merge of '20a2cebedc53676ed04bba9375a4e5a9cd97b6fd'
     and 'c0adc68d6e21c013beb36f789a05d94234c3696a'