From 5862c7dc4f35e4a9810c9171d965931274d95bf4 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 7 Apr 2013 18:14:31 -0400
Subject: [PATCH] ChangeLog

- Combined the two change logs.
---
 ChangeLog     | 28 ++++++++++++++++++++++++++--
 ChangeLog.230 | 27 ---------------------------
 2 files changed, 26 insertions(+), 29 deletions(-)
 delete mode 100644 ChangeLog.230

diff --git a/ChangeLog b/ChangeLog
index acdf69c83..084cbed21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,31 @@
 ------ current release ---------------------------
 
+2.3.0 () -
+
+Features
+ + #328 Replaced the 'shell' command with a standalone 'tasksh' binary, which
+   includes GNU readline support (thanks to Haitham Gad).
+ + #934 support for 'reserved.lines' to accomodate multi-line
+   shell prompts when used in conjunction with 'limit:page' (thanks to Robert
+   Gill).
+ + #1227 A new 'verify_l10n' utility ensures the localizations are in sync (thanks to
+   Wim Schuermann).
+ + Stores un-synched transactions in <data.location>/backlog.data.
+ + Adds a new 'synchronize' command to sync data with a task server.
+ + Adds a new 'sync' verbosity token, which will reminds when a backlog builds
+   up and needs a sync.
+ + Supports IPv4 and IPv6 server addresses.
+
+Bugs
+ + #1197 Now 'tasksh' recognizes Ctrl-D to exit.
+ + #1211 The 'dateformat' settings now default to the ISO-8601 standard of
+   'Y-M-D' (thanks to Robin Björklin).
+ + #1222 The 'summary' report now obeys the 'color.label' setting (thanks to
+   Steve Rader).
+ + Fixed bug so that 'limit:page' now considers footnote messages.
+
+------ old releases ------------------------------
+
 2.2.0 (2013-04-07) 05f7948f7e70d7be3642bdc336faace52eaa9dfb
 
 Features
@@ -141,8 +167,6 @@ Bugs
  + Fixed a bug so that the report filter order is preserved, to enable an
    optimization that was being skipped.
 
------- old releases ------------------------------
-
 2.1.2 (2012-09-18) 1e3176ed70d2b50faf03838d0df279b2a4ae93b2
 
 Bugs
diff --git a/ChangeLog.230 b/ChangeLog.230
deleted file mode 100644
index bf9be2557..000000000
--- a/ChangeLog.230
+++ /dev/null
@@ -1,27 +0,0 @@
------- current release ---------------------------
-
-2.3.0 () -
-
-Features
- + #328 Replaced the 'shell' command with a standalone 'tasksh' binary, which
-   includes GNU readline support (thanks to Haitham Gad).
- + #934 support for 'reserved.lines' to accomodate multi-line
-   shell prompts when used in conjunction with 'limit:page' (thanks to Robert
-   Gill).
- + #1227 A new 'verify_l10n' utility ensures the localizations are in sync (thanks to
-   Wim Schuermann).
- + Stores un-synched transactions in <data.location>/backlog.data.
- + Adds a new 'synchronize' command to sync data with a task server.
- + Adds a new 'sync' verbosity token, which will reminds when a backlog builds
-   up and needs a sync.
- + Supports IPv4 and IPv6 server addresses.
-
-Bugs
- + #1197 Now 'tasksh' recognizes Ctrl-D to exit.
- + #1211 The 'dateformat' settings now default to the ISO-8601 standard of
-   'Y-M-D' (thanks to Robin Björklin).
- + #1222 The 'summary' report now obeys the 'color.label' setting (thanks to
-   Steve Rader).
- + Fixed bug so that 'limit:page' now considers footnote messages.
-
------- old releases ------------------------------