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

Trivial merge