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

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

26eb3f2c95401727ff41aeb5b99abb8e82c57a97