im.pidgin.pidgin: b9ebd6295a3e2b5bd6da52c7fca5640ec443a53d

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: b9ebd6295a3e2b5bd6da52c7fca5640ec443a53d
Ancestor: 4d861866c16a8e87cc915a0d71b0b5a9365cbb3c
Ancestor: c0c02f799dbd59c8922194529a15e73099f21e84
Author: rekkanoryo at pidgin.im
Date: 2007-11-12T05:46:42
Branch: im.pidgin.pidgin

Modified files:
        ChangeLog.win32 libpurple/protocols/silc/silc.c
        libpurple/win32/global.mak

ChangeLog: 

merge of '4d861866c16a8e87cc915a0d71b0b5a9365cbb3c'
     and 'c0c02f799dbd59c8922194529a15e73099f21e84'