# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1272939751 0
# Node ID 7b712cf1726268abce8ac0d286e6925b3b6cbb92
# Parent  ca60dd3812fad8b387dc97caed5ec1f15195c76a# Parent  5c639069557d2da473ef2668b11864dd7c3a54ad
merge of '73eedf837c2384f502418f091300785c19ccfacd'
     and '80ca41a75331b3ca9b4c2a4efa04d72104f4909e'

diff -r ca60dd3812fa -r 7b712cf17262 libpurple/protocols/jabber/auth_cyrus.c