im.pidgin.pidgin: 61c8d242483046a3b3b43cd1afbb794af35a08c9

[elb at pidgin.im]

-----------------------------------------------------------------
Revision: 61c8d242483046a3b3b43cd1afbb794af35a08c9
Ancestor: 58c35aec5c3cdd46ab59070b5e659782d73d8001
Ancestor: ee39fe2d2bc694cf58bd99f447589b8e19da8c66
Author: elb at pidgin.im
Date: 2007-11-27T15:57:03
Branch: im.pidgin.pidgin

Modified files:
        pidgin/gtkconv.c pidgin/gtkimhtml.c pidgin/gtkprefs.c
        po/de.po

ChangeLog: 

merge of '58c35aec5c3cdd46ab59070b5e659782d73d8001'
     and 'ee39fe2d2bc694cf58bd99f447589b8e19da8c66'