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

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

ca536f91aec2e244bd506226809e94f2a29dddd8