pidgin: 5f9f1739: merge of '04fc08604e52c75e1a6fbe762bd0bf...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 5f9f1739bd36559df35014883896a45bab292f3b
Ancestor: 04fc08604e52c75e1a6fbe762bd0bf5646fb7707
Ancestor: 52beafecb8a7a6f963f4ff6271eef29ca699e552
Author: darkrain42 at pidgin.im
Date: 2009-07-15T15:32:11
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5f9f1739bd36559df35014883896a45bab292f3b

Modified files:
        ChangeLog finch/gntrequest.c libpurple/prefs.h
        libpurple/privacy.h libpurple/protocols/jabber/bosh.c
        libpurple/protocols/yahoo/libymsg.c

ChangeLog: 

merge of '04fc08604e52c75e1a6fbe762bd0bf5646fb7707'
     and '52beafecb8a7a6f963f4ff6271eef29ca699e552'