pidgin: 3008dd1f: merge of '0fdedeeaa99f758f800b86adc9613e...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 3008dd1f70a9e9ddc2bbe30c0fae7aba334836fe
Ancestor: 0fdedeeaa99f758f800b86adc9613eac6f3bf692
Ancestor: 4064d5f0f7c619ef0367860f61e4bf45834a6f76
Author: nosnilmot at pidgin.im
Date: 2008-07-02T14:29:26
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3008dd1f70a9e9ddc2bbe30c0fae7aba334836fe

Modified files:
        ChangeLog.API libpurple/protocols/silc/silc.c
        libpurple/protocols/silc10/silc.c po/POTFILES.in

ChangeLog: 

merge of '0fdedeeaa99f758f800b86adc9613eac6f3bf692'
     and '4064d5f0f7c619ef0367860f61e4bf45834a6f76'