# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1190998880 0
# Node ID b1a42d258a14e4595b8f9da234f50cd4b5fa6127
# Parent  fd664b4aa4f1960a08144837972d43ab12b1c452# Parent  07c103ac3795f250c8b08d076ce4d682a3257cbf
explicit merge of '0b88f009442a340d4269c95605f580a9f444e767'
              and 'cb13be33ceda2c587fec6fb3a86d8e777ca7194a'
        to branch 'im.pidgin.pidgin'

diff -r fd664b4aa4f1 -r b1a42d258a14 COPYRIGHT
diff -r fd664b4aa4f1 -r b1a42d258a14 finch/gntconn.c
diff -r fd664b4aa4f1 -r b1a42d258a14 finch/gntconv.c
diff -r fd664b4aa4f1 -r b1a42d258a14 libpurple/protocols/jabber/buddy.c
diff -r fd664b4aa4f1 -r b1a42d258a14 libpurple/protocols/jabber/jabber.c
diff -r fd664b4aa4f1 -r b1a42d258a14 libpurple/protocols/jabber/message.c
diff -r fd664b4aa4f1 -r b1a42d258a14 libpurple/protocols/msn/directconn.c
diff -r fd664b4aa4f1 -r b1a42d258a14 libpurple/protocols/msn/servconn.c
diff -r fd664b4aa4f1 -r b1a42d258a14 libpurple/protocols/myspace/markup.c
diff -r fd664b4aa4f1 -r b1a42d258a14 libpurple/protocols/myspace/myspace.c
diff -r fd664b4aa4f1 -r b1a42d258a14 libpurple/protocols/oscar/oscar.c
diff -r fd664b4aa4f1 -r b1a42d258a14 libpurple/protocols/yahoo/yahoo.c
diff -r fd664b4aa4f1 -r b1a42d258a14 libpurple/util.c
diff -r fd664b4aa4f1 -r b1a42d258a14 libpurple/win32/win32dep.c
diff -r fd664b4aa4f1 -r b1a42d258a14 pidgin/gtkblist.c
diff -r fd664b4aa4f1 -r b1a42d258a14 pidgin/gtkcellrendererexpander.c
diff -r fd664b4aa4f1 -r b1a42d258a14 pidgin/gtkconv.c
diff -r fd664b4aa4f1 -r b1a42d258a14 pidgin/gtkimhtmltoolbar.c
diff -r fd664b4aa4f1 -r b1a42d258a14 pidgin/gtkmain.c
diff -r fd664b4aa4f1 -r b1a42d258a14 pidgin/gtknotify.c
diff -r fd664b4aa4f1 -r b1a42d258a14 pidgin/gtkprefs.c