From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 27 May 2014 10:19:49 +0000 (+0200)
Subject: Merge branch 'dev' into diadems
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=535a00318fd529a733acb4b3129353024dbdf727;p=telemeta.git

Merge branch 'dev' into diadems
---

535a00318fd529a733acb4b3129353024dbdf727