From: Thomas Fillon <thomas@parisson.com>
Date: Wed, 24 May 2017 22:24:30 +0000 (+0200)
Subject: Merge branch 'release/1.7' of github.com:Parisson/telemeta into release/1.7
X-Git-Tag: 1.7.0~2^2~21^2^2~14
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a7343e56de9487f150a374e734e1f4143b3679b0;p=telemeta.git

Merge branch 'release/1.7' of github.com:Parisson/telemeta into release/1.7
---

a7343e56de9487f150a374e734e1f4143b3679b0