# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1170536152 0
# Node ID a369d8735a46a72ff5acc4b98f05b0edbc1d4bbc
# Parent  9c32176ac555123ed91dcb687cbee3eb1a5d33c9# Parent  3267c1cb59841864623725a3bfdd0eeee5887166
merge of '1019b585a198fbfe443c4aedbe484316366f2db3'
     and '72da69b8fdcabdd4962f91693e1ca459b0634f39'

diff -r 9c32176ac555 -r a369d8735a46 pidgin/gtkconv.c