From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 22 Nov 2016 16:03:57 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:Parisson/Telemeta into dev
X-Git-Tag: search~2^2~24
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=07e906ef55c7c3ee991043f41c7adca983e0edbb;p=telemeta.git

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

07e906ef55c7c3ee991043f41c7adca983e0edbb