From: Nicolas Boisselier <nico@MacMini.local>
Date: Tue, 25 Oct 2016 14:30:01 +0000 (+0100)
Subject: Merge branch 'master' of git.nbdom.net:nb
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=f06cf0971658e53955baa3adcfb6f7c99d466c3a;p=nb.git

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

f06cf0971658e53955baa3adcfb6f7c99d466c3a