pidgin: 9860b693: merge of '153989e7ae76bd6d5247eca3569994...

Wed Aug 27 00:57:09 EDT 2008

-----------------------------------------------------------------
Revision: 9860b693346097316a1c47ef0fb094355c3e49ae
Ancestor: 153989e7ae76bd6d5247eca35699948dded65121
Ancestor: 1ef58f8d4eed57be3447aa663ae1d2e32d74ce29
Author: khc at pidgin.im
Date: 2008-08-27T04:53:35
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9860b693346097316a1c47ef0fb094355c3e49ae

Modified files:
        libpurple/protocols/msn/notification.c libpurple/proxy.c

ChangeLog: 

merge of '153989e7ae76bd6d5247eca35699948dded65121'
     and '1ef58f8d4eed57be3447aa663ae1d2e32d74ce29'