From: Thomas Fillon <thomas@parisson.com>
Date: Fri, 18 Aug 2017 12:32:02 +0000 (+0200)
Subject: Merge branch 'master' of github.com:Parisson/Telemeta-doc
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=refs%2Fheads%2Fmaster;p=telemeta-doc.git

Merge branch 'master' of github.com:Parisson/Telemeta-doc

Conflicts:
	Conferences/2015_WAC/submission.rst
---

e1187ddf8dd85d07cdb293359c2dcf6ceaf47fef