pidgin: 371b6104: merge of '6bcd7cfc161122f058f5093da0fab2...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 371b6104658ad98c418ac711643192c2e34428ea
Ancestor: 6bcd7cfc161122f058f5093da0fab2dceeec0cfa
Ancestor: c4834891814ba35fcff3ba313f7afa8eebd4f050
Author: darkrain42 at pidgin.im
Date: 2009-04-26T17:01:05
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/371b6104658ad98c418ac711643192c2e34428ea

Modified files:
        ChangeLog ChangeLog.API doc/account-signals.dox
        finch/gntblist.c libpurple/account.c
        libpurple/protocols/jabber/adhoccommands.c
        libpurple/protocols/jabber/adhoccommands.h
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/message.c libpurple/prpl.c
        libpurple/prpl.h pidgin/gtkblist-theme-loader.c
        pidgin/gtkblist.c pidgin/plugins/themeedit-icon.c
        pidgin/plugins/themeedit-icon.h pidgin/plugins/themeedit.c
        po/de.po

ChangeLog: 

merge of '6bcd7cfc161122f058f5093da0fab2dceeec0cfa'
     and 'c4834891814ba35fcff3ba313f7afa8eebd4f050'