From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 25 Apr 2016 21:42:01 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:Parisson/Telemeta into dev
X-Git-Tag: 1.6.2^2~36
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=803bae5850faa7b08e653d00ff9a1bf0b36565a5;p=telemeta.git

Merge branch 'dev' of github.com:Parisson/Telemeta into dev
---

803bae5850faa7b08e653d00ff9a1bf0b36565a5