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

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

b72868b7eb92b39dacce0e7f0860c31ee72b7435