]> git.nbdom.net Git - nb.git/commitdiff
Merge branch 'master' of git.nbdom.net:nb
authorNicolas Boisselier <nico@MacMini.local>
Fri, 4 Nov 2016 02:00:03 +0000 (02:00 +0000)
committerNicolas Boisselier <nico@MacMini.local>
Fri, 4 Nov 2016 02:00:03 +0000 (02:00 +0000)

Trivial merge