From: root <root@MacMini.local>
Date: Tue, 18 Oct 2016 16:15:01 +0000 (+0100)
Subject: Merge branch 'master' of git.nbdom.net:nb
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=00d2a1e80f3481bbc96b561ce3de110b51d3e6cd;p=nb.git

Merge branch 'master' of git.nbdom.net:nb
---

00d2a1e80f3481bbc96b561ce3de110b51d3e6cd