Revision cbbfda4df3b1bec896cb4b9a8ef8adb5da390ef5

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: cbbfda4df3b1bec896cb4b9a8ef8adb5da390ef5
Ancestor: 2d3971f6a6eaf78acbe06db1824611d0a95e8ae6
Ancestor: cce8d8b155a4305c412429ef006f06d024674cd8
Author: nosnilmot at pidgin.im
Date: 2007-06-10T02:06:18
Branch: im.pidgin.pidgin.2.1.0

Modified files:
        libpurple/protocols/silc/buddy.c
        libpurple/protocols/silc/chat.c
        libpurple/protocols/silc/ops.c
        libpurple/protocols/silc/silc.c
        libpurple/protocols/silc/silcpurple.h
        libpurple/protocols/silc/util.c pidgin/gtkaccount.c

ChangeLog: 

merge of '2d3971f6a6eaf78acbe06db1824611d0a95e8ae6'
     and 'cce8d8b155a4305c412429ef006f06d024674cd8'


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