pidgin: d45e5de5: merge of '72c6d2dad88b0353a473a6e6398fc4...

[khc at pidgin.im]

-----------------------------------------------------------------
Revision: d45e5de55917ad50d03c457b4a66aed2cabd1248
Ancestor: 72c6d2dad88b0353a473a6e6398fc42ad3972716
Ancestor: d1cb8f8d708a727ac0688ccbb562f411e438c635
Author: khc at pidgin.im
Date: 2008-03-21T03:17:36
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d45e5de55917ad50d03c457b4a66aed2cabd1248

Modified files:
        COPYRIGHT ChangeLog configure.ac finch/libgnt/gntwm.c
        libpurple/account.c libpurple/internal.h libpurple/nat-pmp.c
        libpurple/plugins/test.pl
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/xdata.c
        libpurple/protocols/msn/command.c
        libpurple/protocols/myspace/markup.c
        libpurple/protocols/qq/send_core.c
        libpurple/protocols/simple/simple.c
        libpurple/win32/libc_interface.c pidgin/gtkblist.c
        pidgin/gtkconv.c pidgin/gtkmain.c pidgin/gtkscrollbook.c
        pidgin/gtksession.c pidgin/gtksound.c pidgin/gtkutils.c
        pidgin/minidialog.c pidgin/win32/winpidgin.c

ChangeLog: 

merge of '72c6d2dad88b0353a473a6e6398fc42ad3972716'
     and 'd1cb8f8d708a727ac0688ccbb562f411e438c635'