From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 20 Oct 2015 21:50:47 +0000 (+0200)
Subject: Merge branch 'dev' into feature/dj1.8
X-Git-Tag: 1.7.0~2^2~39
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d2f3ac91271708caecbfc0ff7fd3d552677d8e4b;p=telemeta.git

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

d2f3ac91271708caecbfc0ff7fd3d552677d8e4b