pidgin: 5a101784: merge of '7d9bc7a7d232a2b83e7923d0d5d20b...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 5a1017841a92406dc99cecddaba2d175eebf7ab3
Ancestor: 7d9bc7a7d232a2b83e7923d0d5d20be09ed1fc5c
Ancestor: c5c25b1bb0dd4164db9232f426de3aa6055593bd
Author: nosnilmot at pidgin.im
Date: 2008-06-26T01:14:34
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5a1017841a92406dc99cecddaba2d175eebf7ab3

Modified files:
        libpurple/idle.c libpurple/protocols/silc/buddy.c
        libpurple/protocols/silc10/buddy.c po/de.po

ChangeLog: 

merge of '7d9bc7a7d232a2b83e7923d0d5d20be09ed1fc5c'
     and 'c5c25b1bb0dd4164db9232f426de3aa6055593bd'