# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1189464642 0
# Node ID 1e1bed59a86fd14ecfcef85087f633cc22232db0
# Parent  6d04b27c7f53eca87d414dcdfc8b72ab5f67811a# Parent  3321a2136a948375a51836d20dd3fb16442b46fd
merge of '0485ab28f09f39d5e0b47621901f1f0ba0c26c5e'
     and '50c0ed0d3103cf346c8412d88694122c47a0af5e'

diff -r 6d04b27c7f53 -r 1e1bed59a86f libpurple/sslconn.c
diff -r 6d04b27c7f53 -r 1e1bed59a86f libpurple/sslconn.h