From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 18 Apr 2016 09:24:48 +0000 (+0200)
Subject: Merge branch 'master' into dev
X-Git-Tag: 1.6.2^2~39
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2b885bca82a49d8230f407cfff6f61a334ec4c9e;p=telemeta.git

Merge branch 'master' into dev

Conflicts:
	telemeta/pages
---

2b885bca82a49d8230f407cfff6f61a334ec4c9e