]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev' into wip
authorJérémy Fabre <blackmagik88@gmail.com>
Tue, 19 Jul 2016 13:16:26 +0000 (15:16 +0200)
committerJérémy Fabre <blackmagik88@gmail.com>
Tue, 19 Jul 2016 13:16:26 +0000 (15:16 +0200)

Trivial merge