im.pidgin.pidgin: cb5f23cc7be3a9e456a66f0a9325074c5fc23bc1

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: cb5f23cc7be3a9e456a66f0a9325074c5fc23bc1
Ancestor: 167b1c9f831eb7790b419ee62343bb62ad1be92b
Ancestor: 9df2fc149cf63f4ef4232f57f841a386130e61d1
Author: markdoliner at pidgin.im
Date: 2008-01-16T07:32:39
Branch: im.pidgin.pidgin

Modified files:
        libpurple/dnssrv.c libpurple/prpl.c libpurple/prpl.h

ChangeLog: 

merge of '167b1c9f831eb7790b419ee62343bb62ad1be92b'
     and '9df2fc149cf63f4ef4232f57f841a386130e61d1'