]> git.nbdom.net Git - nb.git/commitdiff
Merge branch 'master' of git.nbdom.net:nb
authorNicolas Boisselier <nicolas.boisselier@gmail.com>
Sun, 11 Dec 2016 22:13:24 +0000 (22:13 +0000)
committerNicolas Boisselier <nicolas.boisselier@gmail.com>
Sun, 11 Dec 2016 22:13:24 +0000 (22:13 +0000)

Trivial merge