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

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

c8e50a427184d3867c15470fb83b62b103f167ca