From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 8 Jun 2016 22:05:13 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 1.6.2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4b04d999177972c063794160046e7a330267bc39;p=telemeta.git

Merge branch 'dev'

Conflicts:
	README.rst
	app/scripts/app.sh
---

4b04d999177972c063794160046e7a330267bc39