From: lurchi <lurchi@strangeplace.net>
Date: Sat, 30 Dec 2017 20:32:59 +0000 (+0100)
Subject: merge branch 'refactoring-scheduler'
X-Git-Tag: gnunet-0.11.0rc0~48^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dca8eb9c44dbdfa3fc572dde40c1e0927cfee8db;p=oweals%2Fgnunet.git

merge branch 'refactoring-scheduler'
---

dca8eb9c44dbdfa3fc572dde40c1e0927cfee8db