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

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

df24d21250e8301a3fe8597c6ef1f79578cab032