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

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

ecac6533d7f444735c3dc5733da49746f8dc368e