From: Nicolas Boisselier <nicolas.boisselier@semantico.com>
Date: Thu, 18 Aug 2016 22:00:03 +0000 (+0100)
Subject: Merge branch 'master' of git.nbdom.net:nb
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=696177239e22127d32a1411f3314d027cf7164a6;p=nb.git

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

696177239e22127d32a1411f3314d027cf7164a6