# HG changeset patch
# User Kevin Stange <kevin@simguy.net>
# Date 1210396881 0
# Node ID b08b3a01f0d6e2300b8acd56bd26f85905a7d19e
# Parent  780972e37f0ce3ad0913b3dbfb2f3864527d3d12# Parent  cc1020f9c67e111e575c99e6ada2c4cb46564c41
merge of '0eccb8cefd5975eeab1d14984f2f0114ce7abb79'
     and 'e5bed926001291c25b29f85a8ab39b8297a215da'

diff -r 780972e37f0c -r b08b3a01f0d6 pidgin/pixmaps/logo.png
Binary file pidgin/pixmaps/logo.png has changed