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

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

e20946d02d8387ff1e52a3823f468de8c13549ff