]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev' into prestashop
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 18 Oct 2016 16:13:52 +0000 (18:13 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 18 Oct 2016 16:13:52 +0000 (18:13 +0200)

Trivial merge