From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 14 Jun 2016 09:10:29 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: search~8
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3a316c82b3dc0db88b4504e7fa5ef3ae3b5b4ca4;p=telemeta.git

Merge branch 'dev'
---

3a316c82b3dc0db88b4504e7fa5ef3ae3b5b4ca4