From: t3sserakt <t3ss@posteo.de>
Date: Sun, 21 Jul 2019 18:18:24 +0000 (+0200)
Subject: Merge branch 'cadet-new-options'
X-Git-Tag: v0.11.6~20
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f096bdce8;p=oweals%2Fgnunet.git

Merge branch 'cadet-new-options'
---

f096bdce8eaeaabc42f2a015bf29c422b3d25719