diff pidgin/gtkdocklet-gtk.c @ 30690:7c5f2e776ceb

merge of '188465fa1e8064c35ae348b4c71cee7fb4c7c755' and '278c9cea4265f5e7877b2eaa47e5b44c049cf7f7'
author Paul Aurich <paul@darkrain42.org>
date Sat, 10 Jul 2010 02:10:19 +0000
parents 26c1c5069c28
children 3ed54142386f 7fb5e60fd919
line wrap: on
line diff