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

Trivial merge