pidgin: b5d595a8: merge of '834ee1803fbad0f4960a66592ac436...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: b5d595a88317436d663512f3773a8d65221ecb77
Ancestor: 834ee1803fbad0f4960a66592ac43641f23124c6
Ancestor: a743f7b2086257b37f218802f4ae61803cf5ff01
Author: darkrain42 at pidgin.im
Date: 2009-07-11T07:47:45
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b5d595a88317436d663512f3773a8d65221ecb77

Modified files:
        ChangeLog ChangeLog.API configure.ac
        libpurple/plugins/ssl/ssl-nss.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/msn.h
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/slpmsg.c
        libpurple/protocols/msn/slpmsg.h
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/tests/test_jabber_jutil.c
        libpurple/tests/test_util.c libpurple/util.c
        libpurple/util.h pidgin/gtkconv.c pidgin/gtkutils.c

ChangeLog: 

merge of '834ee1803fbad0f4960a66592ac43641f23124c6'
     and 'a743f7b2086257b37f218802f4ae61803cf5ff01'