im.pidgin.pidgin: e4025d1861da43abe2d5a41c04944203764b1133

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: e4025d1861da43abe2d5a41c04944203764b1133
Ancestor: 3cec6952fcadbd73dddc4c009e798b6fb1789a5b
Ancestor: eba941c70407d0a6e17fa2204792caadadeda848
Author: evands at pidgin.im
Date: 2007-12-18T02:26:57
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/jabber/auth.c libpurple/status.c
        pidgin/gtkconv.c

ChangeLog: 

merge of '3cec6952fcadbd73dddc4c009e798b6fb1789a5b'
     and 'eba941c70407d0a6e17fa2204792caadadeda848'