pidgin: 45ad8960: merge of '16b1eeda9a01e74e4b8906f46cd976...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 45ad8960722e2945da04e780de920cade8d2541e
Ancestor: 16b1eeda9a01e74e4b8906f46cd976bf0935a1c2
Ancestor: dde113d3a3376b87e0c8ed0ede8c73e7ac207135
Author: darkrain42 at pidgin.im
Date: 2009-07-16T02:20:40
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/45ad8960722e2945da04e780de920cade8d2541e

Modified files:
        ChangeLog.API libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h libpurple/sslconn.c
        libpurple/sslconn.h libpurple/tests/test_jabber_jutil.c
        pidgin/gtkdialogs.c pidgin/gtkutils.c po/sv.po

ChangeLog: 

merge of '16b1eeda9a01e74e4b8906f46cd976bf0935a1c2'
     and 'dde113d3a3376b87e0c8ed0ede8c73e7ac207135'