pidgin: 5a908b57: merge of '64869f284f4934e2f05446fc3d5096...

Sun May 25 14:06:12 EDT 2008

-----------------------------------------------------------------
Revision: 5a908b576ed5d885cfd74fdcbccbfe9a07f13f4b
Ancestor: 64869f284f4934e2f05446fc3d50960b6296ad5b
Ancestor: ff389b62b9d93369d7d6f96ca3e913c108d21523
Author: sadrul at pidgin.im
Date: 2008-05-25T18:03:42
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5a908b576ed5d885cfd74fdcbccbfe9a07f13f4b

Modified files:
        AUTHORS doc/pidgin.1.in libpurple/smiley.c
        libpurple/smiley.h pidgin/gtkconv.c pidgin/gtkdialogs.c
        pidgin/gtksmiley.c

ChangeLog: 

merge of '64869f284f4934e2f05446fc3d50960b6296ad5b'
     and 'ff389b62b9d93369d7d6f96ca3e913c108d21523'