pidgin: 1b822949: merge of '61d502ea8377846692aea9189056d7...

Thu Apr 17 13:05:48 EDT 2008

-----------------------------------------------------------------
Revision: 1b822949efa4354726f0d774f743e3417426728a
Ancestor: 61d502ea8377846692aea9189056d7c134660277
Ancestor: a6270c0093cc57b6059401e4023a0ae6e7d8627f
Author: sadrul at pidgin.im
Date: 2008-04-17T17:01:03
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1b822949efa4354726f0d774f743e3417426728a

Modified files:
        configure.ac libpurple/blist.h
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msnp9/userlist.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/yahoo/yahoo.c libpurple/util.h
        libpurple/win32/libc_interface.h
        libpurple/win32/libc_internal.h libpurple/win32/targets.mak
        pidgin/gtkblist.c pidgin/gtkimhtml.c

ChangeLog: 

merge of '61d502ea8377846692aea9189056d7c134660277'
     and 'a6270c0093cc57b6059401e4023a0ae6e7d8627f'