]> git.nbdom.net Git - nb.git/commitdiff
Merge branch 'master' of git.nbdom.net:nb
authorNicolas Boisselier <nicolas.boisselier@gmail.com>
Fri, 23 Jan 2015 12:13:24 +0000 (12:13 +0000)
committerNicolas Boisselier <nicolas.boisselier@gmail.com>
Fri, 23 Jan 2015 12:13:24 +0000 (12:13 +0000)

Trivial merge