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

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

96ff37678ace8fc2b1db8df0ca851f1c9edbb76a