pidgin: cde34c1e: merge of '22ad9aecc804e89b1101cde696e584...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: cde34c1e1275ef33af880e0d29dda3ca7ba42a37
Ancestor: 22ad9aecc804e89b1101cde696e58490a7efd603
Ancestor: 4c5c524129704ad1119bd51ae362bdb123bdaf75
Author: darkrain42 at pidgin.im
Date: 2010-05-01T20:10:21
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/cde34c1e1275ef33af880e0d29dda3ca7ba42a37

Modified files:
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/auth.h
        libpurple/protocols/jabber/auth_plain.c
        libpurple/protocols/jabber/jabber.c po/de.po

ChangeLog: 

merge of '22ad9aecc804e89b1101cde696e58490a7efd603'
     and '4c5c524129704ad1119bd51ae362bdb123bdaf75'