# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1195254094 0
# Node ID 7b30d02a36aa59647be77380fbf2075d568884b5
# Parent  e76b99d95214bba62cf6ff97f23640290e7aa85c# Parent  0cb8d5304f4f3e1c49d0ba66414f029971ec675e
merge of '55275a531f00a6cabade1b8bfe74eafa3c2db4ba'
     and 'a4922c657f183e4b124142298268ba47350a72e0'

diff -r 0cb8d5304f4f -r 7b30d02a36aa ChangeLog.API
diff -r 0cb8d5304f4f -r 7b30d02a36aa finch/gntaccount.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa finch/gntblist.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa finch/gntcertmgr.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa finch/gntconn.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa finch/gntplugin.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa finch/gntpounce.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa finch/gntprefs.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa finch/gntstatus.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/account.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/certificate.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/conversation.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/ft.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/plugins/autoaccept.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/plugins/buddynote.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/plugins/idle.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/plugins/offlinemsg.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/gg/gg.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/jabber/auth.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/jabber/buddy.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/jabber/chat.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/jabber/jabber.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/jabber/presence.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/jabber/si.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/jabber/usermood.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/jabber/usernick.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/jabber/xdata.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/msn/dialog.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/msn/msn.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/novell/novell.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/oscar/oscar.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/oscar/peer.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/qq/buddy_opt.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/qq/group.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/qq/group_im.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/qq/group_join.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/qq/group_opt.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/sametime/sametime.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/silc/buddy.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/silc/ops.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/silc/pk.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/silc/silc.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/silc/util.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/silc/wb.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/silc10/buddy.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/silc10/chat.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/silc10/ops.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/silc10/pk.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/silc10/silc.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/silc10/util.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/silc10/wb.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/toc/toc.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/protocols/yahoo/yahoo.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa libpurple/request.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa pidgin/gtkaccount.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa pidgin/gtkcertmgr.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa pidgin/gtkconv.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa pidgin/gtkprefs.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa pidgin/gtksavedstatuses.c
diff -r 0cb8d5304f4f -r 7b30d02a36aa pidgin/gtkutils.c