pidgin: 0525a147: merge of '8ac2f1461dd4df5ba43e8c0399b594...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 0525a14734461b19a7561e49645fb0df3ebaeea9
Ancestor: 8ac2f1461dd4df5ba43e8c0399b59451b3c549e6
Ancestor: f29197b389e99b8fcdc2b1179c0be21644a4c170
Author: sadrul at pidgin.im
Date: 2008-04-13T17:39:38
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/0525a14734461b19a7561e49645fb0df3ebaeea9

Modified files:
        COPYRIGHT ChangeLog libpurple/conversation.c
        libpurple/protocols/irc/irc.h libpurple/protocols/irc/msgs.c
        libpurple/protocols/irc/parse.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/oscar/oscar.c libpurple/server.c
        libpurple/status.c libpurple/status.h pidgin/gtkblist.c
        pidgin/gtkconv.c pidgin/gtkimhtml.c pidgin/gtkmain.c
        po/de.po

ChangeLog: 

merge of '8ac2f1461dd4df5ba43e8c0399b59451b3c549e6'
     and 'f29197b389e99b8fcdc2b1179c0be21644a4c170'