pidgin: 4f00ea61: merge of '59d7f03afa561d4e3ef6d618e8d8d2...

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: 4f00ea617df3c000b6eb237b4139b89e5d8170a3
Ancestor: 59d7f03afa561d4e3ef6d618e8d8d2a99c0dee88
Ancestor: 987d475b7796c72aacb0fbc5112840600ba70d61
Author: evands at pidgin.im
Date: 2008-05-21T01:59:38
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4f00ea617df3c000b6eb237b4139b89e5d8170a3

Modified files:
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/message.c

ChangeLog: 

merge of '59d7f03afa561d4e3ef6d618e8d8d2a99c0dee88'
     and '987d475b7796c72aacb0fbc5112840600ba70d61'