From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 31 Jan 2017 11:50:41 +0000 (+0100)
Subject: Merge branch 'feature/dj1.8' of github.com:Parisson/Telemeta into feature/dj1.8
X-Git-Tag: 1.7.0~2^2~23
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=48486153e849f43132d4c7b17570ceeb1c7c5e14;p=telemeta.git

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

48486153e849f43132d4c7b17570ceeb1c7c5e14