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

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

af3672d57f159712264dbb88a4b0eecc8c6d4672