]> git.sur5r.net Git - ngadmin/commitdiff
Merge remote-tracking branch 'upstream/master'
authorAlkorin <github@alkorin.fr>
Wed, 4 Mar 2015 14:07:14 +0000 (15:07 +0100)
committerAlkorin <github@alkorin.fr>
Wed, 4 Mar 2015 14:07:14 +0000 (15:07 +0100)

Trivial merge