diff libpurple/protocols/oscar/family_alert.c @ 26737:8b7d1aed6d59

merge of '8ddbfe5d6f5c2455497d11ccbfff769ed4e9fad4' and 'ef988478f33650d37a90cb7c58a9ac5af81b525b'
author Paul Aurich <paul@darkrain42.org>
date Tue, 28 Apr 2009 19:08:06 +0000
parents 6e1967b0f90b
children 11c54d781835
line wrap: on
line diff