From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 26 Sep 2017 10:14:51 +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~21
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=56d8ec0fb4671eb749ae07e4b40acdc58039f545;p=telemeta.git

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

56d8ec0fb4671eb749ae07e4b40acdc58039f545