im.pidgin.pidgin: ef615b4ae18609e0cbe2783aafc7a5114db4a06f

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: ef615b4ae18609e0cbe2783aafc7a5114db4a06f
Ancestor: 958829ffd959717a69243c55ac0ef6b6fc52c1a7
Ancestor: fbe2de5c539aa0d47df62237611550760cae618b
Author: markdoliner at pidgin.im
Date: 2007-12-03T08:57:47
Branch: im.pidgin.pidgin

Modified files:
        doc/finch.1.in libpurple/protocols/oscar/family_feedbag.c

ChangeLog: 

merge of '958829ffd959717a69243c55ac0ef6b6fc52c1a7'
     and 'fbe2de5c539aa0d47df62237611550760cae618b'