# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1196473706 0
# Node ID c5e55b596d1eb3197996b68f3ca17999aabc7fb0
# Parent  bea1d9075c7e2c22cb03f841ad717b49a0d1bb0f# Parent  922960f829f964560fdd682ade1c8fa0d2f1ea4e
explicit merge of '340d730b1b1e1164ee9eab77968ffd03cdf4996e'
              and '3d09514342c28c798103b050651727e19709c903'

diff -r 922960f829f9 -r c5e55b596d1e pidgin/gtkconv.c