pidgin: 4a876e5a: merge of 'b4330cb0af1a74cd8826d08447a38a...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 4a876e5a5a2dedc3099c3b7de3101dfa0de86482
Ancestor: b4330cb0af1a74cd8826d08447a38a366f1be3fc
Ancestor: cc1c38e65de5e260ddb2bf7ccca720025570ef47
Author: darkrain42 at pidgin.im
Date: 2009-07-21T06:48:31
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4a876e5a5a2dedc3099c3b7de3101dfa0de86482

Modified files:
        libpurple/plugins/ssl/ssl-gnutls.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/servconn.h

ChangeLog: 

merge of 'b4330cb0af1a74cd8826d08447a38a366f1be3fc'
     and 'cc1c38e65de5e260ddb2bf7ccca720025570ef47'