Revision 9f945661f1a87f1a99fe5dbe7e1b8b7e95989122

[wehlhard at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 9f945661f1a87f1a99fe5dbe7e1b8b7e95989122
Ancestor: 5d4b00a88466bb9e851eaca42ab3fd3f2c4093ef
Ancestor: e2bf4d2bd2deeff5ae939ecc159eb07697dc61c0
Author: wehlhard at soc.pidgin.im
Date: 2007-09-13T04:32:19
Branch: im.pidgin.pidgin

Modified files:
        COPYRIGHT ChangeLog finch/gntconv.c libpurple/ntlm.c
        libpurple/plugins/ssl/ssl-nss.c
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/msn.c libpurple/protocols/msn/msn.h
        libpurple/protocols/msn/servconn.c libpurple/proxy.c
        pidgin/gtkcertmgr.c pidgin/gtkconv.c
        pidgin/plugins/musicmessaging/musicmessaging.c

ChangeLog: 

merge of '5d4b00a88466bb9e851eaca42ab3fd3f2c4093ef'
     and 'e2bf4d2bd2deeff5ae939ecc159eb07697dc61c0'


To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from 9f945661f1a87f1a99fe5dbe7e1b8b7e95989122