From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 21 Dec 2015 23:03:16 +0000 (+0100)
Subject: Merge branch 'dev' into crem
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b26412bb388604de2b72569078019f09875d4c73;p=telemeta.git

Merge branch 'dev' into crem
---

b26412bb388604de2b72569078019f09875d4c73