# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1204740791 0
# Node ID 7ba68075beea72e1cce706efe090005fd9f31b51
# Parent  316c8565f562a9e4f0e6f0142fac8aa38e25eea5# Parent  6eb0749ad46c34c534f4e1514541998a542bf35a
merge of 'e4cc3b79eb04e4937c5fa764f6839a8e07397651'
     and 'f6f182a65daf42e9f1e50f409e9d965119d3932f'

diff -r 316c8565f562 -r 7ba68075beea libpurple/proxy.c