diff pidgin/gtkdocklet.c @ 28061:6d9dc2a2a797

merge of '024d245a8148c47c777a691d387fefdc58337f9c' and '4f11d99af7ba7c9e9151d49663a55cb4c7e44fe2'
author Paul Aurich <paul@darkrain42.org>
date Tue, 28 Jul 2009 22:25:41 +0000
parents 4aa5400b1b99
children e304b1a0b516
line wrap: on
line diff