From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 11 May 2016 08:59:22 +0000 (+0200)
Subject: Merge branch 'dev' of https://github.com/ThomasBalastegui/Telemeta into ThomasBalaste... 
X-Git-Tag: 1.6.2^2~18^2~8
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8cf35013997df175b52e551634fd9d326310d282;p=telemeta.git

Merge branch 'dev' of https://github.com/ThomasBalastegui/Telemeta into ThomasBalastegui-dev
---

8cf35013997df175b52e551634fd9d326310d282