im.pidgin.pidgin: b4befce4cfdb728ea19a179577241d06e3a57fa9

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: b4befce4cfdb728ea19a179577241d06e3a57fa9
Ancestor: 15fcc72f6db29d572909078a86fb269698314506
Ancestor: cb5f23cc7be3a9e456a66f0a9325074c5fc23bc1
Author: markdoliner at pidgin.im
Date: 2008-01-16T07:37:39
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/oscar/family_buddy.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/oscar.h libpurple/prpl.c
        libpurple/prpl.h

ChangeLog: 

merge of '15fcc72f6db29d572909078a86fb269698314506'
     and 'cb5f23cc7be3a9e456a66f0a9325074c5fc23bc1'