diff libpurple/protocols/sametime/sametime.c @ 17829:b1754db7010b

merge of '1e340ceaf355a27660847defa34d87510ce35d6d' and 'fbd7e09eb7982024bdb675a64ce31c7410e0b220'
author Stu Tomlinson <stu@nosnilmot.com>
date Mon, 11 Jun 2007 00:23:35 +0000
parents 928fc0ecd6b6
children 3e437e86bd6e ab6d2763b8d8
line wrap: on
line diff