# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1177633696 0
# Node ID 56071eee3c73af75e19e7fd837ba79187bfd8a6c
# Parent  bae950ad2ef258c6b2f2ca75317b64fb384d6bf6# Parent  d9fdd89c4dcb82ddca18470ef2c47da7c592ff2b
merge of '5b7c6ae7f0cb97a61a77ede61bfd12e531b875ae'
     and '775f6026784d0209d3e30ce3a71757ff81eef11c'

diff -r d9fdd89c4dcb -r 56071eee3c73 pidgin/win32/nsis/pixmaps/pidgin-install.ico
Binary file pidgin/win32/nsis/pixmaps/pidgin-install.ico has changed