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

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

97752613db97998e164c4f77a0dd80eec53b4654