Revision 18c3386b9cf3eedcd0c991b730da936b7c6446a8

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 18c3386b9cf3eedcd0c991b730da936b7c6446a8
Ancestor: 132fa9527970403283e8e3418c010de94a4908fb
Ancestor: c2e429692e25b126620781c16fc59d14b601dc5c
Author: markdoliner at pidgin.im
Date: 2007-04-29T17:15:45
Branch: im.pidgin.pidgin

Modified files:
        Makefile.am libpurple/protocols/jabber/auth.c
        pidgin/gtkstatusbox.c

ChangeLog: 

merge of '132fa9527970403283e8e3418c010de94a4908fb'
     and 'c2e429692e25b126620781c16fc59d14b601dc5c'


To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from 18c3386b9cf3eedcd0c991b730da936b7c6446a8