From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 20 Jan 2016 20:33:09 +0000 (+0100)
Subject: Merge branch 'dev' into feature/haystack
X-Git-Tag: 1.6b~5^2~4^2~3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=77a5314c15b49ef717a84186d74b5717b0405dfe;p=telemeta.git

Merge branch 'dev' into feature/haystack
---

77a5314c15b49ef717a84186d74b5717b0405dfe