Revision 6f6e8345100a2f026e20c28fa52592fadd9c8193

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: 6f6e8345100a2f026e20c28fa52592fadd9c8193
Ancestor: 3ac5981b26be545a8c546e09b6689c2359fad1bb
Ancestor: fb7cfe3a2656a5b9be388e3bba6923561a454ca7
Author: evands at pidgin.im
Date: 2007-05-12T20:34:56
Branch: im.pidgin.pidgin

Modified files:
        libpurple/conversation.c libpurple/protocols/msn/msn.c
        libpurple/server.c pidgin/gtkmain.c

ChangeLog: 

merge of '3ac5981b26be545a8c546e09b6689c2359fad1bb'
     and 'fb7cfe3a2656a5b9be388e3bba6923561a454ca7'


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