From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 2 Jun 2017 11:12:42 +0000 (+0200)
Subject: Merge branch 'dev' into feature/html5
X-Git-Tag: search~2^2~19^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=50c38cfc3321803b44431016ec176ab203fa4324;p=telemeta.git

Merge branch 'dev' into feature/html5
---

50c38cfc3321803b44431016ec176ab203fa4324