From: Tobias Oetiker <tobi@oetiker.ch>
Date: Thu, 13 Aug 2020 07:14:34 +0000 (+0200)
Subject: Merge branch 'master' into add-jsontime
X-Git-Tag: v1.8.0~34^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1087%2Fhead;p=thirdparty%2Frrdtool-1.x.git

Merge branch 'master' into add-jsontime
---

3a52e22d5b7063be4b0b044c90cbfa6905994b8f