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

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

554af7e2461978aabc78685208b544b2ae64d2a5