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

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

2ae173d6b1f0a5e20453b2b23529b0b5c1cff9a5