im.pidgin.pidgin: 7a436ba53de6adebccf4e920ca62d544e13b1094

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: 7a436ba53de6adebccf4e920ca62d544e13b1094
Ancestor: 59ab2b78429c94d5d0fc77b1b7892accb524e2a4
Ancestor: e440d3119d6686976d657170c1fce857f4aecfc4
Author: evands at pidgin.im
Date: 2007-10-15T23:46:12
Branch: im.pidgin.pidgin

Modified files:
        finch/libgnt/gntfilesel.c libpurple/notify.c
        libpurple/notify.h libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/user.c libpurple/status.h
        pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkdocklet.c

ChangeLog: 

merge of '59ab2b78429c94d5d0fc77b1b7892accb524e2a4'
     and 'e440d3119d6686976d657170c1fce857f4aecfc4'