From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 27 Apr 2017 16:44:17 +0000 (+0200)
Subject: Merge branch 'master' of git.parisson.com:git/teleforma
X-Git-Tag: 1.1~14^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c3524db3be35c75818d2497620df016200912090;p=teleforma.git

Merge branch 'master' of git.parisson.com:git/teleforma
---

c3524db3be35c75818d2497620df016200912090