diff pidgin/gtkdocklet-gtk.c @ 31380:9877f1307a0d

merge of '21547ef2d3fe0b84909cf441e8a0eff458724c91' and '5564794af3dcdf5ee3ff698ebf4221072e6c8be7'
author Mark Doliner <mark@kingant.net>
date Sun, 21 Nov 2010 09:40:48 +0000
parents 26c1c5069c28
children 3ed54142386f 7fb5e60fd919
line wrap: on
line diff