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

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

3045c08f84ea6ed894a73829f56780ab6f3537e5