From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 28 May 2014 13:24:02 +0000 (+0200)
Subject: Merge branch 'dev' into diadems
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5663048e4f8ef568585f65e15ee464309c0a17c3;p=telemeta.git

Merge branch 'dev' into diadems
---

5663048e4f8ef568585f65e15ee464309c0a17c3