commit 167f3bc4ecbe4f0265413f3a1b91b6faab1c0f81 Merge: 2758ae30b3 98b9df61f6 Author: George Kadianakis desnacked@riseup.net Date: Tue Jul 6 13:42:53 2021 +0300

Merge branch 'maint-0.4.5' into maint-0.4.6

changes/bug40383 | 7 +++++++ configure.ac | 1 + src/lib/encoding/time_fmt.c | 35 +++++++++++++++++++++++++++++++++-- src/lib/encoding/time_fmt.h | 6 ++++++ src/test/test_util.c | 26 +++++++++++++++++++++++++- 5 files changed, 72 insertions(+), 3 deletions(-)