From 94bca5443a46cf3abf5fe713a3bb21208d44a07d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 8 Aug 2010 13:29:23 -0400
Subject: [PATCH] Documentation

- Added #421 'Data sync' to the ChangeLog.
---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index ac137de3c..ba234dcce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,8 @@
  + Added feature #391, now the 'task color legend' command will show
    samples of all the defined colors and color rules from your .taskrc
    and theme.
+ + Added feature #421, and now task can sync data files from two sources
+   via the 'merge' command.
  + Added feature #423, now custom report filters allow rc overrides.
  + Added feature #428, preparing the new structure for the NEWS file.
  + Added feature #429, which improves the 'all' report to exclude deleted.