From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 13 Jan 2016 10:34:18 +0000 (+0100)
Subject: Merge branch 'crem' of github.com:Parisson/Telemeta into crem
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8b3cb3eb2cd0401a1cce3e2d554b107abde823f5;p=telemeta.git

Merge branch 'crem' of github.com:Parisson/Telemeta into crem

Conflicts:
	telemeta/pages
---

8b3cb3eb2cd0401a1cce3e2d554b107abde823f5