# HG changeset patch
# User Peter Hjalmarsson <xake@rymdraket.net>
# Date 1236185567 0
# Node ID 983311560ef9953c11521492a673a92af18555ce
# Parent  d03177395ae022a4e7402718838e0edd3e73dacc# Parent  4d758dcd57159c9f92899563641228b04bbdf8e7
merge of 'b7c7f0f5daca252711952e60e283dd18a1983d33'
     and 'e878814dfc99f1f0a681a2263488c75a068c7c8e'

diff -r 4d758dcd5715 -r 983311560ef9 pidgin/gtkconn.c