From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 13 Apr 2016 11:56:54 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/app' into test
X-Git-Tag: 1.6.1~1^2~8
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=695ea0d746d380e8cc4f06f49e3547d66f61901f;p=telemeta.git

Merge remote-tracking branch 'origin/app' into test
---

695ea0d746d380e8cc4f06f49e3547d66f61901f