# HG changeset patch
# User Richard Laager <rlaager@pidgin.im>
# Date 1170536152 0
# Node ID e1218d38c2cdf9f8452f235fe71447107ac6a608
# Parent  8039a694e22549e3c25568e73a6a5397e698666e# Parent  03a1f1509d96ebd11a8279195640b3d64903754c
merge of '8039a694e22549e3c25568e73a6a5397e698666e'
     and '03a1f1509d96ebd11a8279195640b3d64903754c'

diff -r 8039a694e225 -r e1218d38c2cd pidgin/gtkconv.c