pidgin: c4bc1dcd: merge of '00a9efda899566f921e7c8bbe98a0e...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: c4bc1dcd8ef47d0f4cf6192dc1a7a3a05d49f54a
Ancestor: 00a9efda899566f921e7c8bbe98a0eb684855f62
Ancestor: 3eeb91e664292daec9b2da60f43bbda91140b1de
Author: sadrul at pidgin.im
Date: 2008-06-07T20:37:46
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c4bc1dcd8ef47d0f4cf6192dc1a7a3a05d49f54a

Modified files:
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h pidgin/gtksavedstatuses.c

ChangeLog: 

merge of '00a9efda899566f921e7c8bbe98a0eb684855f62'
     and '3eeb91e664292daec9b2da60f43bbda91140b1de'