]> git.nbdom.net Git - nb.git/commitdiff
Merge branch 'master' of git.nbdom.net:nb
authorNicolas Boisselier <nicolas.boisselier@gmail.com>
Thu, 5 Feb 2015 22:11:03 +0000 (23:11 +0100)
committerNicolas Boisselier <nicolas.boisselier@gmail.com>
Thu, 5 Feb 2015 22:11:03 +0000 (23:11 +0100)

Trivial merge