From 18395a8dc0cc9e004438467f3bbef8c0e69fd43d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 14 Apr 2019 19:38:01 -0400
Subject: [PATCH] - Thanks to Chad Phillips

---
 AUTHORS   |  5 +++++
 ChangeLog | 24 ++++++++++++++++++------
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index f1988ec77..4c9574999 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -146,7 +146,12 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Tiago Matias
   Simon Ruderich
   Kirill Bobyrev
+  Simon Désaulniers
+  Janik Rabe
+  mrossinek
+  taiyu-len
   Lionel Miller
+  Chad Phillips
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
diff --git a/ChangeLog b/ChangeLog
index 384b9e6ae..e8f478489 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -97,29 +97,41 @@
            Thanks to tom-doerr
 - TW #2020 reserved.lines is not affecting the burndown height
            Thanks to ad₋si
+- TW #2047 Exiting the task editor with an error code doesn't remove the lock file
+           Thanks to coaxial
+- TW #2051 doc/man: ready tasks sorted with started tasks 1st
+           Thanks to Simon Désaulniers
+- TW #2053 Do not set CMP0037 on CMake 3.11.0 and above
+           Thanks to Janik Rabe
+- #2077    Change taskrc override priority, respect verbose override, refactor.
+           Thanks to taiyu-len
+- #2108    CmdHistory: repeat unit if a larger unit changes
+           Thanks to Janik Rabe
+- #2132    JSON encode/decode string UDAs
+           Thanks to Chad Phillips
 - Added 'juhannus' as a synonym for 'midsommarafton'
-          Thanks to Lynoure Braakman
+           Thanks to Lynoure Braakman
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'
   virtual tag.
 - Removed deprecated 'alias._query' setting.
 - Fixed ambiguity in the esp-ESP localization
-          Thanks to Fidel Mato
+           Thanks to Fidel Mato
 - Deprecated the 'new-uuid' verbosity option, since its functionality can be
   removed by merging with 'new-id'.
 - Correct a false-positive warning when a due date is removed and a wait is
   added.
 - Added 'QUARTER' virtual tag.
 - Fixed unquoted glob in bash completion script
-          Thanks to Ran Benita
+           Thanks to Ran Benita
 - Deprecated use of alternate Boolean configuration settings. Use values "0" for
   off, and "1" for on. Avoid used of "on", "off", "true", "t", "false", "f",
   "yes", "y", "no", "n".
 - Fixed test harness for Python 3.x.
-          Thanks to jrabbit
+           Thanks to jrabbit
 - Improved certificate validation diagnostics
-          Thanks to Jelle van der Waa
+           Thanks to Jelle van der Waa
 - Improved portability for SunOS-like OSes.
-          Thanks to Antonio Huete Jimenez
+           Thanks to Antonio Huete Jimenez
 - Updated the 'timesheet' command with a more compact report that accepts a
   filter, and has a default filter showing the last four weeks of completed and
   started tasks.