diff -r 57932e991854 -r 5275135955c0 ChangeLog
--- a/ChangeLog	Fri Oct 24 17:51:57 2003 -0400
+++ b/ChangeLog	Fri Oct 24 17:55:22 2003 -0400
@@ -3,9 +3,10 @@
   * Add display name to Preferences.
   * Add folders view with Add.
   * Add a default view between folders and dynamic view.
+  * Add a "remove keyword?" to the merge command.
   * Move things around so the code is a bit (really a bit) cleaner.
 
- -- Fabien Ninoles <fabien@tzone.org>  Fri, 17 Oct 2003 15:04:26 -0400
+ -- Fabien Ninoles <fabien@tzone.org>  Fri, 24 Oct 2003 17:54:14 -0400
 
 xbelweb (0.1-4) unstable; urgency=low