From: Thomas Fillon <thomas@parisson.com>
Date: Thu, 8 Jun 2017 14:40:54 +0000 (+0200)
Subject: Merge branch 'dev' into release/1.6.4
X-Git-Tag: search~2^2~3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3da87c51cfa87dd254b3272e30ad393e7b8f0862;p=telemeta.git

Merge branch 'dev' into release/1.6.4

Conflicts:
	lib/TimeSide
---

3da87c51cfa87dd254b3272e30ad393e7b8f0862