]> git.nbdom.net Git - nb.git/commitdiff
Merge branch 'master' of git.nbdom.net:nb
authorNicolas Boisselier <nicolas.boisselier@gmail.com>
Wed, 1 Feb 2017 13:56:11 +0000 (14:56 +0100)
committerNicolas Boisselier <nicolas.boisselier@gmail.com>
Wed, 1 Feb 2017 13:56:11 +0000 (14:56 +0100)

Trivial merge