# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1182094142 0
# Node ID 1100b05e9fb7f7de59da53c015b5dfe5ad5e68c6
# Parent  c4518bbca2406b66986a1f0ffea224602a9f5799# Parent  703872bf33c62d1e87c6368ced6f5148ba7068c7
merge of '32961dad56e96e8d450230e7266cffe8b7deb058'
     and '7997723d5d06867d57a08dedf7d62b52c4be20e0'

diff -r 703872bf33c6 -r 1100b05e9fb7 libpurple/debug.c
diff -r 703872bf33c6 -r 1100b05e9fb7 libpurple/prefs.c
--- a/libpurple/prefs.c	Sun Jun 17 15:27:35 2007 +0000
+++ b/libpurple/prefs.c	Sun Jun 17 15:29:02 2007 +0000
@@ -1355,7 +1355,6 @@
 	purple_prefs_remove("/plugins/core/autorecon/hide_reconnecting_dialog");
 	purple_prefs_remove("/plugins/core/autorecon/restore_state");
 	purple_prefs_remove("/plugins/core/autorecon");
-	purple_prefs_remove("/purple/debug/timestamps");
 
 	/* Convert old sounds while_away pref to new 3-way pref. */
 	if (purple_prefs_exists("/purple/sound/while_away") &&
diff -r 703872bf33c6 -r 1100b05e9fb7 pidgin/gtkprefs.c