pidgin: e62c6f63: merge of '021b2e6a0a1a494338bfc1491b59ac...

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: e62c6f638c31e0b145d389c1a61c4aaf9fae0c5f
Ancestor: 021b2e6a0a1a494338bfc1491b59acee849ec048
Ancestor: 123a3369e1dd05078b2707f46de36749d4147153
Author: deryni at pidgin.im
Date: 2009-02-18T03:27:04
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e62c6f638c31e0b145d389c1a61c4aaf9fae0c5f

Modified files:
        COPYRIGHT ChangeLog Makefile.am finch/libgnt/gntwm.c
        libpurple/plugins/perl/common/Server.xs
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/msg.c
        libpurple/protocols/msn/msnutils.c
        libpurple/protocols/msn/nexus.c
        libpurple/protocols/msn/nexus.h
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/session.c
        libpurple/protocols/msn/session.h
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/simple/simple.c libpurple/proxy.c
        libpurple/savedstatuses.c libpurple/util.h pidgin/gtkblist.c
        pidgin/gtkconv.c pidgin/gtkdialogs.c pidgin/gtkprefs.c
        pidgin/pidgintooltip.c

ChangeLog: 

merge of '021b2e6a0a1a494338bfc1491b59acee849ec048'
     and '123a3369e1dd05078b2707f46de36749d4147153'