pidgin: f9d2a098: merge of '7f396ae5ae1a07562f3822bfdf32a5...

Sat Jul 4 04:00:56 EDT 2009

-----------------------------------------------------------------
Revision: f9d2a098156b3fd9141160bb50c8299383c9d831
Ancestor: 7f396ae5ae1a07562f3822bfdf32a5b71b737970
Ancestor: b5c22753df947a633375026b7e424152cb435539
Author: qulogic at pidgin.im
Date: 2009-07-04T07:54:50
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f9d2a098156b3fd9141160bb50c8299383c9d831

Modified files:
        doc/PERL-HOWTO.dox doc/connection-signals.dox
        libpurple/plugins/log_reader.c
        libpurple/plugins/offlinemsg.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/novell/novell.c
        libpurple/protocols/qq/send_file.c
        libpurple/protocols/yahoo/yahoo.c pidgin/gtkcertmgr.c
        pidgin/gtkimhtml.c pidgin/gtkutils.c
        pidgin/plugins/musicmessaging/musicmessaging.c
        pidgin/plugins/sendbutton.c
        pidgin/plugins/win32/winprefs/winprefs.c

ChangeLog: 

merge of '7f396ae5ae1a07562f3822bfdf32a5b71b737970'
     and 'b5c22753df947a633375026b7e424152cb435539'