Revision 9e832cea16395c9007bc9e384ee379b293b99abd

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 9e832cea16395c9007bc9e384ee379b293b99abd
Ancestor: a58972b72c7aa0fa0899c5a6b96e51cd6c427ab4
Ancestor: c81dcebd2a5d9d2f7d8cd80ba8c673bc9b8ad6d5
Author: markdoliner at pidgin.im
Date: 2007-06-04T06:15:43
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/oscar/flap_connection.c
        libpurple/purple-remote libpurple/util.c

ChangeLog: 

merge of 'a58972b72c7aa0fa0899c5a6b96e51cd6c427ab4'
     and 'c81dcebd2a5d9d2f7d8cd80ba8c673bc9b8ad6d5'


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