From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 13 Apr 2016 14:14:47 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 1.6.1~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=317d200851835f7de496d537c47ec15195a40a88;p=telemeta.git

Merge branch 'dev'
---

317d200851835f7de496d537c47ec15195a40a88