]> git.nbdom.net Git - nb.git/commitdiff
Merge branch 'master' of git.nbdom.net:nb
authorNicolas Boisselier <nico@MacMini.local>
Mon, 24 Oct 2016 11:15:01 +0000 (12:15 +0100)
committerNicolas Boisselier <nico@MacMini.local>
Mon, 24 Oct 2016 11:15:01 +0000 (12:15 +0100)

Trivial merge