From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 20 May 2016 15:56:22 +0000 (+0200)
Subject: Merge branch 'dev' into ThomasBalastegui-dev
X-Git-Tag: 1.6.2^2~18^2~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=129d79ec53410e790c36a25d451d38c538c8f8eb;p=telemeta.git

Merge branch 'dev' into ThomasBalastegui-dev
---

129d79ec53410e790c36a25d451d38c538c8f8eb