From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 27 Jan 2017 11:29:06 +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~24
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b30746fdae1eb7f7e79e737c044b1e23429bd283;p=telemeta.git

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

b30746fdae1eb7f7e79e737c044b1e23429bd283