diff libpurple/protocols/jabber/si.c @ 22206:1a7b74a20bfe

merge of '468a779996a2b7c9313bb894084fb632307d35fc' and 'd44026793424c7c578d48c0a980af92541633ad9'
author Evan Schoenberg <evan.s@dreskin.net>
date Fri, 25 Jan 2008 22:20:58 +0000
parents a464d2bd6f01 52dac048b541
children 919074aa02ca e9cf897bd873
line wrap: on
line diff