From: root <root@MacMini.local>
Date: Thu, 20 Oct 2016 08:30:02 +0000 (+0100)
Subject: Merge branch 'master' of git.nbdom.net:nb
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=241fc66f93a010ab32f85892a76039fe787d761f;p=nb.git

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

241fc66f93a010ab32f85892a76039fe787d761f