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

Trivial merge