diff libpurple/protocols/oscar/family_icbm.c @ 28504:bb923bcae9de

merge of '661db628ce40c3548058f062ea72d9687654d53a' and '8a71ac6c6bfac72c7077754c4d8178b77f14b18f'
author Mark Doliner <mark@kingant.net>
date Wed, 04 Nov 2009 22:16:51 +0000
parents 28d73d34d792
children a538cb73f897
line wrap: on
line diff