From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Thu, 20 Nov 2014 23:42:15 +0000 (+0000)
Subject: Merge branch 'master' of git.nbdom.net:nb
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=d18d2ded97e61938c952088e2270bc8a7458fa6f;p=nb.git

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

d18d2ded97e61938c952088e2270bc8a7458fa6f