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

Trivial merge