pidgin: afe47892: merge of '6922052516b4de648838827a2c1806...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: afe47892e8666653b150f107576c12a2cea68619
Ancestor: 6922052516b4de648838827a2c1806840619d49a
Ancestor: a2f4d295f1d985858eacada121adb414f6cc924b
Author: qulogic at pidgin.im
Date: 2009-01-27T05:23:38
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/afe47892e8666653b150f107576c12a2cea68619

Modified files:
        COPYRIGHT ChangeLog libpurple/certificate.c libpurple/core.c
        libpurple/dbus-analyze-functions.py
        libpurple/protocols/msn/cmdproc.c
        libpurple/protocols/msn/cmdproc.h
        libpurple/protocols/msn/msg.h libpurple/status.c
        pidgin/gtkimhtml.c

ChangeLog: 

merge of '6922052516b4de648838827a2c1806840619d49a'
     and 'a2f4d295f1d985858eacada121adb414f6cc924b'