pidgin: c6ab942a: merge of '04d1cb7493b8f54f33a413d3a60468...

Mon May 26 16:10:44 EDT 2008

-----------------------------------------------------------------
Revision: c6ab942a565a274680983552ced9a21feb5f24a9
Ancestor: 04d1cb7493b8f54f33a413d3a60468704ab4be4b
Ancestor: 77546963b893bde7fedfb022b63831b78d3f81e1
Author: elb at pidgin.im
Date: 2008-05-26T20:03:40
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c6ab942a565a274680983552ced9a21feb5f24a9

Modified files:
        libpurple/core.c pidgin/gtkmain.c po/de.po

ChangeLog: 

merge of '04d1cb7493b8f54f33a413d3a60468704ab4be4b'
     and '77546963b893bde7fedfb022b63831b78d3f81e1'