pidgin: a5a6fd56: merge of 'cc409aa9063c22b3cf65c9e2a3399a...

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: a5a6fd56ee57e35a3e26f2a66d5615248a279d45
Ancestor: cc409aa9063c22b3cf65c9e2a3399a121c6b50a5
Ancestor: dde47619c5574f42aca27bf71d79520541c713a0
Author: evands at pidgin.im
Date: 2008-05-29T11:42:08
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a5a6fd56ee57e35a3e26f2a66d5615248a279d45

Modified files:
        libpurple/protocols/oscar/oscar.c pidgin/gtkaccount.c
        pidgin/gtkimhtml.c pidgin/gtksmiley.c

ChangeLog: 

merge of 'cc409aa9063c22b3cf65c9e2a3399a121c6b50a5'
     and 'dde47619c5574f42aca27bf71d79520541c713a0'