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

Merge branch 'dev'
---

baefdf8435680acabbb50b23cc947ca52d18c1df