pidgin: 7bb9ee4f: merge of '5e33eda76b698c04377f5ad6cdd3ad...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 7bb9ee4f51b9f32e2764aa3a6dcd765b2af2e7f6
Ancestor: 5e33eda76b698c04377f5ad6cdd3ad1ec87d2eff
Ancestor: e935afc929a5049cfa89072e6e9dd8e3ab0afa54
Author: qulogic at pidgin.im
Date: 2008-07-17T05:26:47
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7bb9ee4f51b9f32e2764aa3a6dcd765b2af2e7f6

Modified files:
        libpurple/cipher.c libpurple/protocols/bonjour/bonjour_ft.c
        libpurple/protocols/msn/cmdproc.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/oim.c
        libpurple/protocols/msn/session.c
        libpurple/protocols/msn/session.h
        libpurple/protocols/msn/slpsession.c
        libpurple/protocols/msn/slpsession.h

ChangeLog: 

merge of '5e33eda76b698c04377f5ad6cdd3ad1ec87d2eff'
     and 'e935afc929a5049cfa89072e6e9dd8e3ab0afa54'