From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Thu, 5 Feb 2015 22:11:03 +0000 (+0100)
Subject: Merge branch 'master' of git.nbdom.net:nb
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=174b61d2d19be22b2dd47a16dc58feb7fefb5ba9;p=nb.git

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

174b61d2d19be22b2dd47a16dc58feb7fefb5ba9