diff libpurple/protocols/sametime/sametime.c @ 23969:4ecea8ae3d21

merge of '3c1dec61837db8f0f51fc35f7ca26ff948a4e4f4' and 'd03f77d92751b3104fa7f211c86084c46a8679b7'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Tue, 26 Aug 2008 04:08:22 +0000
parents 27eacd38c721
children 4bc74deeb503 6757bffb3d3a 16734635febf
line wrap: on
line diff