pidgin: e203c427: merge of '0c2f544829df2f3a369504315f8b3a...

Sun Jul 19 13:50:26 EDT 2009

-----------------------------------------------------------------
Revision: e203c427bfa7fe568764fe445d008e1867dd5740
Ancestor: 0c2f544829df2f3a369504315f8b3a6cc325749a
Ancestor: f2bce03092740049135bf66058679e1091699175
Author: khc at pidgin.im
Date: 2009-07-19T17:45:08
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e203c427bfa7fe568764fe445d008e1867dd5740

Modified files:
        ChangeLog finch/gntmedia.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/servconn.h
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/silc/silc.c libpurple/util.c po/de.po

ChangeLog: 

merge of '0c2f544829df2f3a369504315f8b3a6cc325749a'
     and 'f2bce03092740049135bf66058679e1091699175'