From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 3 Jul 2014 14:40:00 +0000 (+0200)
Subject: Merge branch 'dev' into crem
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9de053ef0d1fe1686a72ab343ed8622409e99985;p=telemeta.git

Merge branch 'dev' into crem
---

9de053ef0d1fe1686a72ab343ed8622409e99985