pidgin: 4a162e9b: merge of '4c5110037671f84e3e775214c32692...

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 4a162e9b862d99d336070d75e4668bfac02af163
Ancestor: 4c5110037671f84e3e775214c32692b5b23c11e1
Ancestor: ce267e26db218ed48b76eb6ba6eda0e40cf170c7
Author: rlaager at pidgin.im
Date: 2008-04-28T22:04:07
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4a162e9b862d99d336070d75e4668bfac02af163

Modified files:
        libpurple/protocols/oscar/family_admin.c
        libpurple/protocols/oscar/misc.c

ChangeLog: 

merge of '4c5110037671f84e3e775214c32692b5b23c11e1'
     and 'ce267e26db218ed48b76eb6ba6eda0e40cf170c7'