]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev' into wip
authorJérémy Fabre <blackmagik88@gmail.com>
Fri, 15 Jul 2016 12:30:03 +0000 (14:30 +0200)
committerJérémy Fabre <blackmagik88@gmail.com>
Fri, 15 Jul 2016 12:30:03 +0000 (14:30 +0200)

Trivial merge