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

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

dccf1e22cfcfab174ac251738271047c50d56fb9