From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 31 Aug 2015 09:06:20 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 1.6a~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c357856a49aa50de5884e317963e9ea2dd162bda;p=telemeta.git

Merge branch 'dev'
---

c357856a49aa50de5884e317963e9ea2dd162bda