pidgin: 5f86c51d: merge of '08fd5918978aecbd045771fb72fd0d...

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 5f86c51d96715086ed0790a769fd222be570c8ac
Ancestor: 08fd5918978aecbd045771fb72fd0d80c7fcf941
Ancestor: f74d7dbbb04d8d3d1d07486f87dcd96937196c88
Author: rlaager at pidgin.im
Date: 2008-12-08T17:19:52
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5f86c51d96715086ed0790a769fd222be570c8ac

Modified files:
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/bonjour/buddy.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/oscar/bstream.c
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/family_icq.c
        libpurple/protocols/oscar/oscar.h

ChangeLog: 

merge of '08fd5918978aecbd045771fb72fd0d80c7fcf941'
     and 'f74d7dbbb04d8d3d1d07486f87dcd96937196c88'