From: root <root@MacMini.local>
Date: Thu, 13 Oct 2016 10:41:27 +0000 (+0100)
Subject: Merge branch 'master' of git.nbdom.net:nb
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=e171a8b3b311da7646912d72d013f02418e06b32;p=nb.git

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

e171a8b3b311da7646912d72d013f02418e06b32