From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 24 Aug 2017 16:50:33 +0000 (+0200)
Subject: Merge branch 'dev' into feature/eunmeration
X-Git-Tag: 1.6.4^2^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f518331d9251ba8b4db73fe14d70dc1739de7991;p=telemeta.git

Merge branch 'dev' into feature/eunmeration
---

f518331d9251ba8b4db73fe14d70dc1739de7991