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

Trivial merge