From: Emilie Zawadzki <zawadzki@ircam.fr>
Date: Thu, 19 Jan 2017 16:03:11 +0000 (+0100)
Subject: oMerge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b284d8c0575316b876a0187e24d868acf6483294;p=mezzo.git

oMerge branch 'dev'
---

b284d8c0575316b876a0187e24d868acf6483294