From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 18 Apr 2016 14:59:00 +0000 (+0200)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.6.2^2~38
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b2d754b647e76d11cd206e1c3a1fdc3994bc36d3;p=telemeta.git

Merge branch 'master' into dev
---

b2d754b647e76d11cd206e1c3a1fdc3994bc36d3