diff pidgin/gtkprivacy.c @ 18456:0e8b2bb66a7d

merge of '54ca7908e9d5ca615490f92be7a4be6bdf9d9baa' and '6fa4458c20080f2ce1f66a6ee4761c192b8510d5'
author Nathan Walp <nwalp@pidgin.im>
date Tue, 03 Jul 2007 12:12:33 +0000
parents 8817e226b64a
children 44b4e8bd759b 617aa1bd7ff0
line wrap: on
line diff