pidgin: 82713a60: merge of '1fde8168a6eb08e558dabefc069a0e...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 82713a606d8246d160d73aaea50214755d04aebb
Ancestor: 1fde8168a6eb08e558dabefc069a0eba15a5a6ee
Ancestor: a151fac3bff3fa30792223f1e70e2a491cada0ed
Author: qulogic at pidgin.im
Date: 2008-11-14T06:57:56
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/82713a606d8246d160d73aaea50214755d04aebb

Modified files:
        COPYRIGHT ChangeLog configure.ac finch/libgnt/gntentry.c
        libpurple/dbus-analyze-functions.py
        libpurple/protocols/bonjour/Makefile.am
        libpurple/protocols/gg/Makefile.am
        libpurple/protocols/irc/Makefile.am
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/msn/Makefile.am
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/msg.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/session.c
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/slpcall.h
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/slplink.h
        libpurple/protocols/msn/slpmsg.c
        libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/switchboard.h
        libpurple/protocols/msn/transaction.c
        libpurple/protocols/msnp9/Makefile.am
        libpurple/protocols/myspace/Makefile.am
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/myspace.h
        libpurple/protocols/novell/Makefile.am
        libpurple/protocols/null/Makefile.am
        libpurple/protocols/oscar/Makefile.am
        libpurple/protocols/qq/Makefile.am
        libpurple/protocols/sametime/Makefile.am
        libpurple/protocols/silc/Makefile.am
        libpurple/protocols/silc10/Makefile.am
        libpurple/protocols/simple/Makefile.am
        libpurple/protocols/toc/Makefile.am
        libpurple/protocols/yahoo/Makefile.am
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo.h
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/protocols/zephyr/Makefile.am pidgin/gtkconv.c
        pidgin/plugins/markerline.c pidgin/plugins/sendbutton.c

ChangeLog: 

merge of '1fde8168a6eb08e558dabefc069a0eba15a5a6ee'
     and 'a151fac3bff3fa30792223f1e70e2a491cada0ed'