]> git.nbdom.net Git - nb.git/commitdiff
Merge branch 'master' of git.nbdom.net:nb
authorNicolas Boisselier <nicolas.boisselier@gmail.com>
Wed, 19 Nov 2014 23:25:18 +0000 (23:25 +0000)
committerNicolas Boisselier <nicolas.boisselier@gmail.com>
Wed, 19 Nov 2014 23:25:18 +0000 (23:25 +0000)

Trivial merge