From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Sat, 2 Apr 2016 23:07:07 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:Parisson/Telemeta into dev
X-Git-Tag: 1.6^2~13
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a6396cb8e6e7ad6a29ff4a7503dc5b49cea7bcc8;p=telemeta.git

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

a6396cb8e6e7ad6a29ff4a7503dc5b49cea7bcc8