# HG changeset patch
# User Casey Harkins <charkins@pidgin.im>
# Date 1193591329 0
# Node ID d41c5443f44334f3a0bf45a21fb24ae5ca302792
# Parent  8c5e34b6782dd228b5cf8a2e6a8e5d3bf91e5fd6# Parent  d3e0eb05ac94fdf2dba84a44d962b83dc2dd6e98
merge of 'bb426e3c52ba2442bfbf7ec6159714fca242cb92'
     and 'd35dd87d97af4087e74e0a16d574533ab62dad8f'

diff -r d3e0eb05ac94 -r d41c5443f443 pidgin/gtkdocklet.c