pidgin: cd52e24a: merge of '456501a9151822d8b2538d62e92918...

[bjoern at cs.tu-berlin.de]

-----------------------------------------------------------------
Revision: cd52e24aa4674e626d22e1b9855726346732a8a4
Ancestor: 456501a9151822d8b2538d62e92918e5126f93bc
Ancestor: e3b8963da04c30b9550f678536ab3874b0ffb6c5
Author: bjoern at cs.tu-berlin.de
Date: 2008-05-10T21:36:14
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/cd52e24aa4674e626d22e1b9855726346732a8a4

Modified files:
        ChangeLog autogen.sh pidgin/gtkconn.c
        pidgin/gtkimhtmltoolbar.c po/de.po

ChangeLog: 

merge of '456501a9151822d8b2538d62e92918e5126f93bc'
     and 'e3b8963da04c30b9550f678536ab3874b0ffb6c5'