From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 10 Jun 2016 16:19:42 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:Parisson/Telemeta into dev
X-Git-Tag: search~8^2~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6f8e96f6da10f578ca15e71a1ca2f35a5f5c9902;p=telemeta.git

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

6f8e96f6da10f578ca15e71a1ca2f35a5f5c9902