From: Guillaume Pellerin Date: Thu, 4 Feb 2016 00:58:45 +0000 (+0100) Subject: Merge branch 'dev' of git.parisson.com:git/teleforma into dev X-Git-Tag: 1.1~107^2 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3250b49db200f805cbac7bf6c3cd0bf6dd9bebd9;p=teleforma.git Merge branch 'dev' of git.parisson.com:git/teleforma into dev --- 3250b49db200f805cbac7bf6c3cd0bf6dd9bebd9