pidgin: dabe77d5: merge of '16c1dbfe5a0090d97df6477c7f8235...

Sun Dec 14 20:55:42 EST 2008

-----------------------------------------------------------------
Revision: dabe77d56a2fc7c171caa81bd12d72ce8737a7a8
Ancestor: 16c1dbfe5a0090d97df6477c7f8235365d07090c
Ancestor: dbad9300b40f03937a5bed27529b9c1445d02322
Author: qulogic at pidgin.im
Date: 2008-12-15T01:53:50
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/dabe77d56a2fc7c171caa81bd12d72ce8737a7a8

Modified files:
        ChangeLog libpurple/protocols/msn/msg.c
        libpurple/protocols/msn/oim.c
        libpurple/protocols/myspace/markup.c pidgin/gtkimhtml.c

ChangeLog: 

merge of '16c1dbfe5a0090d97df6477c7f8235365d07090c'
     and 'dbad9300b40f03937a5bed27529b9c1445d02322'