]> git.nbdom.net Git - nb.git/commitdiff
Merge branch 'master' of git.nbdom.net:nb
authorroot <root@MacMini.local>
Fri, 14 Oct 2016 09:45:01 +0000 (10:45 +0100)
committerroot <root@MacMini.local>
Fri, 14 Oct 2016 09:45:01 +0000 (10:45 +0100)

Trivial merge