pidgin: 18d75fa5: merge of '40b061a8675f87ba328a5a07734084...

Tue Apr 15 19:50:43 EDT 2008

-----------------------------------------------------------------
Revision: 18d75fa55ab4fa515205724091361fd8b79350f4
Ancestor: 40b061a8675f87ba328a5a07734084fdd7f3006a
Ancestor: d232d797aa7f444c80d47cf543f62a260c2b02b0
Author: evands at pidgin.im
Date: 2008-04-15T23:46:13
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/18d75fa55ab4fa515205724091361fd8b79350f4

Modified files:
        COPYRIGHT finch/gntlog.c libpurple/conversation.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/win32/libc_interface.h
        libpurple/win32/libc_internal.h libpurple/win32/targets.mak
        pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkimhtml.c
        pidgin/plugins/markerline.c

ChangeLog: 

merge of '40b061a8675f87ba328a5a07734084fdd7f3006a'
     and 'd232d797aa7f444c80d47cf543f62a260c2b02b0'