From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 3 May 2017 17:15:10 +0000 (+0200)
Subject: Merge branch 'release/1.7' of github.com:Parisson/Telemeta into release/1.7
X-Git-Tag: 1.7.0~2^2~21^2^2~14^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e6bb9b4bd31820bc83c314a9a6413acd5ec61014;p=telemeta.git

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

e6bb9b4bd31820bc83c314a9a6413acd5ec61014