# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1179345827 0
# Node ID c0dd45834fd92c886f3737e3de255942c039cc2d
# Parent  9d5121f2ab5dbbc190d4ee4f629e5e4a04953059# Parent  34a7860e0084c4fa844de2ef0432be5d9ce4f1d4
merge of 'a1ba1e5be5adb02dcd76cbde3bc4d88287bff6a2'
     and 'c8d55903f073565484356511751eef0941282def'

diff -r 9d5121f2ab5d -r c0dd45834fd9 libpurple/core.c