]> git.nbdom.net Git - nb.git/commitdiff
Merge branch 'master' of git.nbdom.net:nb
authorroot <root@MacMini.local>
Tue, 18 Oct 2016 16:15:01 +0000 (17:15 +0100)
committerroot <root@MacMini.local>
Tue, 18 Oct 2016 16:15:01 +0000 (17:15 +0100)

Trivial merge