im.pidgin.pidgin: 7c341c631158977d493bcc6bf4935163a3b7f0db

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 7c341c631158977d493bcc6bf4935163a3b7f0db
Ancestor: 07d6eac62e7097b98307ba42488a44faf47a14e4
Ancestor: 8e868e68fa3050bfdc7a758df26c20b564f4e5f9
Author: sadrul at pidgin.im
Date: 2007-12-04T09:32:06
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/oscar/family_feedbag.c

ChangeLog: 

merge of '07d6eac62e7097b98307ba42488a44faf47a14e4'
     and '8e868e68fa3050bfdc7a758df26c20b564f4e5f9'