pidgin: 6ff3e48f: merge of '1aa8a701c81527c4f91549a4546a54...

Fri Mar 7 11:56:11 EST 2008

-----------------------------------------------------------------
Revision: 6ff3e48f37ce327ca03e8d3394cac62e40b6fe05
Ancestor: 1aa8a701c81527c4f91549a4546a54262fccce6d
Ancestor: 91af0bfbaeb9c7439d242dc7783d2c5e10cf7572
Author: sadrul at pidgin.im
Date: 2008-03-07T16:56:02
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/6ff3e48f37ce327ca03e8d3394cac62e40b6fe05

Modified files:
        ChangeLog finch/libgnt/gntentry.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h

ChangeLog: 

merge of '1aa8a701c81527c4f91549a4546a54262fccce6d'
     and '91af0bfbaeb9c7439d242dc7783d2c5e10cf7572'