pidgin: 0800f09f: merge of '27b0c8383de99fccc9cd6f312ac355...

Wed Jul 15 00:30:37 EDT 2009

-----------------------------------------------------------------
Revision: 0800f09f6994e5ae06fed4644a78d33ab4346866
Ancestor: 27b0c8383de99fccc9cd6f312ac355f9e4a4d267
Ancestor: d5aa8b561c618705b25a69e3c0aaea812f4abee6
Author: darkrain42 at pidgin.im
Date: 2009-07-14T22:47:52
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/0800f09f6994e5ae06fed4644a78d33ab4346866

Modified files:
        libpurple/privacy.h libpurple/protocols/jabber/disco.c

ChangeLog: 

merge of '27b0c8383de99fccc9cd6f312ac355f9e4a4d267'
     and 'd5aa8b561c618705b25a69e3c0aaea812f4abee6'