pidgin: da72c293: merge of 'dbc9826dcdc90ce976e932cdb52c29...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: da72c2930b742de61d1acf73b9b75d7d91d3cbdf
Ancestor: dbc9826dcdc90ce976e932cdb52c297e114df42c
Ancestor: dc8a7158a5b62a33fc8e2ba848e31729dd9d8081
Author: rekkanoryo at pidgin.im
Date: 2009-08-16T23:25:51
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/da72c2930b742de61d1acf73b9b75d7d91d3cbdf

Modified files:
        ChangeLog ChangeLog.API INSTALL doc/core-signals.dox
        doc/funniest_home_convos.txt doc/jabber-signals.dox
        finch/libgnt/gntkeys.c libpurple/ft.c libpurple/ft.h
        libpurple/media.c libpurple/mediamanager.c
        libpurple/pounce.c libpurple/prefs.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/jingle/rtp.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/Makefile.mingw
        libpurple/protocols/msn/cmdproc.c
        libpurple/protocols/msn/directconn.c
        libpurple/protocols/msn/msg.c
        libpurple/protocols/msn/session.h
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/slpmsg.h
        libpurple/protocols/msn/sync.h
        libpurple/protocols/msn/userlist.h
        libpurple/protocols/msnp9/slplink.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/myspace.h
        libpurple/protocols/yahoo/libyahoo.c
        libpurple/protocols/yahoo/libyahoojp.c
        libpurple/protocols/yahoo/libymsg.c libpurple/proxy.c
        libpurple/purple-send libpurple/purple-send-async
        libpurple/savedstatuses.c libpurple/status.c
        libpurple/util.c pidgin/gtkblist.c pidgin/gtkcertmgr.c
        pidgin/gtkdialogs.c pidgin/gtkimhtml.c pidgin/gtkmedia.c
        po/ChangeLog po/de.po po/eo.po po/he.po po/hu.po po/nn.po
        po/ro.po

ChangeLog: 

merge of 'dbc9826dcdc90ce976e932cdb52c297e114df42c'
     and 'dc8a7158a5b62a33fc8e2ba848e31729dd9d8081'