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

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

abc5d5c08eb8829e3c278d3d3ebe8655006259cc