From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 27 Mar 2017 08:17:15 +0000 (+0200)
Subject: Merge branch 'feature/dj1.8' of github.com:Parisson/Telemeta into feature/dj1.8
X-Git-Tag: 1.7.0~2^2~22
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d221cb9f8fcd4f7911bc84adf8c32da7f15ee74f;p=telemeta.git

Merge branch 'feature/dj1.8' of github.com:Parisson/Telemeta into feature/dj1.8
---

d221cb9f8fcd4f7911bc84adf8c32da7f15ee74f