# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1192321978 0
# Node ID 84b9b98070e5a9645f0486c5e68e0b13bd2be8eb
# Parent  7821fa7b22db94b27ba98fdbbe9ff46e2b289156# Parent  cab348e39751b2ee4e2d86b092910231c6208b78
merge of 'b17e0283464425b6dabc3d5bf6ccabd33ab920c1'
     and 'c484d979c4fda4433a9633ff8b69bd8a395c9479'

diff -r 7821fa7b22db -r 84b9b98070e5 libpurple/protocols/jabber/chat.c
diff -r 7821fa7b22db -r 84b9b98070e5 libpurple/protocols/jabber/jabber.c
diff -r 7821fa7b22db -r 84b9b98070e5 libpurple/protocols/jabber/usermood.c
diff -r 7821fa7b22db -r 84b9b98070e5 libpurple/protocols/msn/msn.c
diff -r 7821fa7b22db -r 84b9b98070e5 libpurple/protocols/oscar/oscar.c
diff -r 7821fa7b22db -r 84b9b98070e5 libpurple/protocols/qq/buddy_info.c
diff -r 7821fa7b22db -r 84b9b98070e5 libpurple/protocols/sametime/sametime.c
diff -r 7821fa7b22db -r 84b9b98070e5 pidgin/gtkaccount.c
diff -r 7821fa7b22db -r 84b9b98070e5 pidgin/gtkblist.c
diff -r 7821fa7b22db -r 84b9b98070e5 pidgin/gtkdebug.c
diff -r 7821fa7b22db -r 84b9b98070e5 pidgin/gtkdialogs.c
diff -r 7821fa7b22db -r 84b9b98070e5 pidgin/gtkimhtmltoolbar.c
diff -r 7821fa7b22db -r 84b9b98070e5 pidgin/gtklog.c
diff -r 7821fa7b22db -r 84b9b98070e5 pidgin/gtkplugin.c
diff -r 7821fa7b22db -r 84b9b98070e5 pidgin/gtkpounce.c
diff -r 7821fa7b22db -r 84b9b98070e5 pidgin/gtkutils.c