pidgin: 50ee8ea9: merge of 'c6ab942a565a274680983552ced9a2...

Mon May 26 16:55:48 EDT 2008

-----------------------------------------------------------------
Revision: 50ee8ea93d28a742019b72de39c81427af3ca785
Ancestor: c6ab942a565a274680983552ced9a21feb5f24a9
Ancestor: f7d017b07571640c01e4ebb88a33ceb638a133bb
Author: resiak at pidgin.im
Date: 2008-05-26T20:51:10
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/50ee8ea93d28a742019b72de39c81427af3ca785

Modified files:
        COPYRIGHT configure.ac libpurple/buddyicon.h
        libpurple/core.c libpurple/prpl.h pidgin/gtkconv.c
        pidgin/gtkdocklet.c pidgin/gtkmain.c pidgin/gtkutils.c
        po/de.po

ChangeLog: 

merge of 'c6ab942a565a274680983552ced9a21feb5f24a9'
     and 'f7d017b07571640c01e4ebb88a33ceb638a133bb'