pidgin.next.minor: 41372e88: merge of '584de5e77d7a29a10037eba7c064d7...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: 41372e88b17179e87ec17daec7e464d413ef69d7
Ancestor: 584de5e77d7a29a10037eba7c064d791f2814821
Ancestor: 65542da15a8b1f08f18238f3d7223dc65f983822
Author: rekkanoryo at pidgin.im
Date: 2009-11-08T23:38:08
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/41372e88b17179e87ec17daec7e464d413ef69d7

Added files:
        pidgin/gtkdocklet-gtk.c
Modified files:
        COPYRIGHT ChangeLog finch/libgnt/gnttree.c
        libpurple/protocols/bonjour/mdns_avahi.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/oob.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/useravatar.c
        libpurple/protocols/msn/nexus.c
        libpurple/protocols/oscar/clientlogin.c
        libpurple/protocols/oscar/family_feedbag.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/libaim.c
        libpurple/protocols/oscar/libicq.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/oscarcommon.h pidgin/gtkmain.c
        pidgin/plugins/disco/gtkdisco.c
        pidgin/plugins/disco/gtkdisco.h pidgin.desktop.in

ChangeLog: 

merge of '584de5e77d7a29a10037eba7c064d791f2814821'
     and '65542da15a8b1f08f18238f3d7223dc65f983822'