Revision a3579a3e45da4afa4a33aae8652233405e2c43a2

[nwalp at pidgin.im]

-----------------------------------------------------------------
Revision: a3579a3e45da4afa4a33aae8652233405e2c43a2
Ancestor: 17044aa63b0858da0a71332e152b5f3440fa5107
Ancestor: 3d1e6b8637ff9133c8f17e9aeaeea1284c898d86
Author: nwalp at pidgin.im
Date: 2007-06-04T14:09:08
Branch: im.pidgin.pidgin

Modified files:
        libpurple/conversation.c libpurple/plugins/joinpart.c
        libpurple/plugins/log_reader.c
        libpurple/plugins/perl/perl-handlers.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/silc/silc.c
        libpurple/protocols/yahoo/yahoo_packet.c
        libpurple/purple-remote libpurple/util.c

ChangeLog: 

merge of '17044aa63b0858da0a71332e152b5f3440fa5107'
     and '3d1e6b8637ff9133c8f17e9aeaeea1284c898d86'


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