pidgin: f3cf3ba1: merge of 'a9849c98b16073a1bf0fbb87a998f0...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: f3cf3ba10ebc911a27833496dcc4d4dca3de66c5
Ancestor: a9849c98b16073a1bf0fbb87a998f0970e0dc810
Ancestor: f580299840f7a33175c94be79f7b1997fa75001b
Author: qulogic at pidgin.im
Date: 2009-02-01T09:14:24
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f3cf3ba10ebc911a27833496dcc4d4dca3de66c5

Modified files:
        COPYRIGHT ChangeLog ChangeLog.win32 libpurple/network.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/msg.h
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/silc/silc.c
        pidgin/plugins/win32/winprefs/winprefs.c

ChangeLog: 

merge of 'a9849c98b16073a1bf0fbb87a998f0970e0dc810'
     and 'f580299840f7a33175c94be79f7b1997fa75001b'