Revision d8217810ec688aadf5a81ba5b95f0ccefafe3d95

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: d8217810ec688aadf5a81ba5b95f0ccefafe3d95
Ancestor: 12df03445c45ddd504a76c52aa7a78e633426dbe
Ancestor: d7cd3990c80b359b4542dfad2ffc0a3f4fb3cac7
Author: datallah at pidgin.im
Date: 2007-02-14T02:28:44
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h

ChangeLog: 

merge of '12df03445c45ddd504a76c52aa7a78e633426dbe'
     and 'd7cd3990c80b359b4542dfad2ffc0a3f4fb3cac7'


To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from d8217810ec688aadf5a81ba5b95f0ccefafe3d95