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

Merge branch 'dev'
---

ef9aeff4d00c8640be9b49ada20729a7137fbfad