]> git.sur5r.net Git - ngadmin/commitdiff
Merge remote-tracking branch 'upstream/master' master
authorAlkorin <github@alkorin.fr>
Wed, 5 Oct 2016 18:00:33 +0000 (20:00 +0200)
committerAlkorin <github@alkorin.fr>
Wed, 5 Oct 2016 18:00:33 +0000 (20:00 +0200)

Trivial merge