pidgin: e243e423: merge of '75a466dd96590961d154c6e5d131d8...

Fri Jun 5 15:10:34 EDT 2009

-----------------------------------------------------------------
Revision: e243e42305af8ed19b940f5c931eaa9279fbe19e
Ancestor: 75a466dd96590961d154c6e5d131d85bcae642c6
Ancestor: 920617286db82f86def448f0e2233ade2f89a0a9
Author: darkrain42 at pidgin.im
Date: 2009-06-05T19:06:22
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e243e42305af8ed19b940f5c931eaa9279fbe19e

Modified files:
        COPYRIGHT ChangeLog ChangeLog.API
        libpurple/protocols/jabber/auth.c pidgin/gtkimhtml.c
        pidgin/gtksmiley.c pidgin/gtksmiley.h

ChangeLog: 

merge of '75a466dd96590961d154c6e5d131d85bcae642c6'
     and '920617286db82f86def448f0e2233ade2f89a0a9'