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

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

eae6ad639a3ee29d3d467ef8482454335c44be0b