From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 11 Oct 2016 15:43:19 +0000 (+0200)
Subject: Merge branch 'dev' into prestashop
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=13df8a02c4976f562908dae65cad42c6e93c4156;p=mezzo.git

Merge branch 'dev' into prestashop
---

13df8a02c4976f562908dae65cad42c6e93c4156