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

Trivial merge