pidgin: 570c5daf: merge of '47385c29904d4755361546c34319cf...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 570c5daf55a59f3c7271d3b5a50bd4d3024f7a80
Ancestor: 47385c29904d4755361546c34319cf036d5a8723
Ancestor: a32d1e1358009ce730a50b32e63fbe6c3a63c4fb
Author: sadrul at pidgin.im
Date: 2008-04-05T19:37:26
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/570c5daf55a59f3c7271d3b5a50bd4d3024f7a80

Modified files:
        ChangeLog doc/gtkrc-2.0 pidgin/gtkconv.c pidgin/gtkimhtml.c
        po/de.po

ChangeLog: 

merge of '47385c29904d4755361546c34319cf036d5a8723'
     and 'a32d1e1358009ce730a50b32e63fbe6c3a63c4fb'