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

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

40b5e3cf701e321a229d3c0f37d750b6309d7119