pidgin: 86f8b3e5: merge of '86b04a102905cb20d3279090e84cde...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 86f8b3e5d789c691f873f515a92fe8e111dcab6e
Ancestor: 86b04a102905cb20d3279090e84cdeffd30e95bc
Ancestor: b53dfa538234bb69f691cdc3fad5defc469fc770
Author: nosnilmot at pidgin.im
Date: 2008-03-21T21:11:07
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/86f8b3e5d789c691f873f515a92fe8e111dcab6e

Modified files:
        ChangeLog pidgin/pixmaps/protocols/16/jabber.png
        pidgin/pixmaps/protocols/16/scalable/jabber.svg
        pidgin/pixmaps/protocols/22/jabber.png
        pidgin/pixmaps/protocols/22/scalable/jabber.svg
        pidgin/pixmaps/protocols/48/jabber.png
        pidgin/pixmaps/protocols/48/scalable/jabber.svg po/de.po

ChangeLog: 

merge of '86b04a102905cb20d3279090e84cdeffd30e95bc'
     and 'b53dfa538234bb69f691cdc3fad5defc469fc770'