diff libpurple/protocols/oscar/family_alert.c @ 26765:998f471bb801

merge of '04463c4228e4760066ef026178e08886db366915' and '277dbfa504b60a873008deb330ed734a384e33f5'
author Paul Aurich <paul@darkrain42.org>
date Fri, 01 May 2009 16:09:50 +0000
parents 6e1967b0f90b
children 11c54d781835
line wrap: on
line diff