pidgin: 3a93d6a9: merge of '705949560fe813ff0ffc4170eb4ca7...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 3a93d6a9f17c32fb5379bb3f2294392fac142b92
Ancestor: 705949560fe813ff0ffc4170eb4ca7545d1bd4e4
Ancestor: ba3f5db0711c5a3b7c5b5510df2e5e3ae5adbbc3
Author: markdoliner at pidgin.im
Date: 2008-06-13T18:35:25
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3a93d6a9f17c32fb5379bb3f2294392fac142b92

Modified files:
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/si.h
        libpurple/protocols/simple/simple.c pidgin/gtkconv.c
        pidgin/gtkutils.c po/de.po

ChangeLog: 

merge of '705949560fe813ff0ffc4170eb4ca7545d1bd4e4'
     and 'ba3f5db0711c5a3b7c5b5510df2e5e3ae5adbbc3'