pidgin: 4bcf3f02: merge of 'e9d34ab5e47f22b35fd2d69d61a2c9...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 4bcf3f0205f9363e2b1f2539d041ede1a6cf15c7
Ancestor: e9d34ab5e47f22b35fd2d69d61a2c943cc0653db
Ancestor: fc3d5c2a3920e0875ac235415cea9fc7f5ed780c
Author: markdoliner at pidgin.im
Date: 2010-02-18T08:10:58
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4bcf3f0205f9363e2b1f2539d041ede1a6cf15c7

Modified files:
        ChangeLog ChangeLog.API ChangeLog.win32 NEWS configure.ac
        finch/libgnt/gnttree.c libpurple/certificate.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/chat.h
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/slpmsg.h pidgin/Makefile.am
        pidgin/gtkimhtml.c pidgin/gtkprefs.c po/ca.po
        po/ca at valencia.po

ChangeLog: 

merge of 'e9d34ab5e47f22b35fd2d69d61a2c943cc0653db'
     and 'fc3d5c2a3920e0875ac235415cea9fc7f5ed780c'