From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 26 Sep 2017 10:38:14 +0000 (+0200)
Subject: Merge branch 'dev' into feature/dj1.8
X-Git-Tag: 1.7.0~2^2~20
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=128fece1ed2218a99caa3c250eada5230dd4fe93;p=telemeta.git

Merge branch 'dev' into feature/dj1.8
---

128fece1ed2218a99caa3c250eada5230dd4fe93