pidgin: 27b0c838: merge of '03e0254c6871c4730755a200d34d4a...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 27b0c8383de99fccc9cd6f312ac355f9e4a4d267
Ancestor: 03e0254c6871c4730755a200d34d4adacdf40c66
Ancestor: fe1b9e426c3f6f96ab00db928c3c9249746e5845
Author: markdoliner at pidgin.im
Date: 2009-07-14T21:25:10
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/27b0c8383de99fccc9cd6f312ac355f9e4a4d267

Modified files:
        libpurple/privacy.h libpurple/protocols/qq/group_im.c
        libpurple/server.c

ChangeLog: 

merge of '03e0254c6871c4730755a200d34d4adacdf40c66'
     and 'fe1b9e426c3f6f96ab00db928c3c9249746e5845'