From: xrs <xrs@mail36.net>
Date: Wed, 17 Jun 2020 20:07:39 +0000 (+0200)
Subject: Merge branch 'master' into rewrite_of_cadet_test
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=49cf7a8e893eaf7682ac12c7d0ea5ca4a6d1a73d;p=oweals%2Fgnunet.git

Merge branch 'master' into rewrite_of_cadet_test
---

49cf7a8e893eaf7682ac12c7d0ea5ca4a6d1a73d