diff libpurple/protocols/oscar/family_icbm.c @ 30587:52ffd59b26fc

merge of '34e44fc5b81fa29b233deac42ea221cb1c367101' and '3ccde42b2f5cfa1fae01e997cfa85f4f9b89abe5'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Thu, 03 Jun 2010 23:13:03 +0000
parents f18b6eb0ed02
children 9623db527d1e d24c975c68a5 879baaf87aa2
line wrap: on
line diff