From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Fri, 23 Jan 2015 12:13:24 +0000 (+0000)
Subject: Merge branch 'master' of git.nbdom.net:nb
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=63bb6532d96d9e593ed4003c155532879db57d01;p=nb.git

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

63bb6532d96d9e593ed4003c155532879db57d01