# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1201299658 0
# Node ID 1a7b74a20bfe2700c9b4ff76f5afb77e71819492
# Parent  a464d2bd6f01acbe658d4a661fd2dc05d53122d3# Parent  52dac048b54145cceac41d071ea5f963316b14cb
merge of '468a779996a2b7c9313bb894084fb632307d35fc'
     and 'd44026793424c7c578d48c0a980af92541633ad9'

diff -r a464d2bd6f01 -r 1a7b74a20bfe libpurple/protocols/jabber/si.c