From: root <root@MacMini.local>
Date: Fri, 14 Oct 2016 09:45:01 +0000 (+0100)
Subject: Merge branch 'master' of git.nbdom.net:nb
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=1c7045cf8a777eeaedf8211d3221da8bb096cf96;p=nb.git

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

1c7045cf8a777eeaedf8211d3221da8bb096cf96