comparison libpurple/protocols/sametime/sametime.c @ 23544:3ca9800a9be3

merge of '1a465eae5dc1b7bfc09b0724788403c096f461ce' and '532937221446ba2643f5101c22ae58abc83fa1be'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Mon, 14 Jul 2008 03:04:03 +0000
parents 6fe3a32c5ee9
children 27eacd38c721 ff29208e03ef
comparison
equal deleted inserted replaced
23542:d8e83a6a4127 23544:3ca9800a9be3