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

Merge branch 'dev' into crem
---

225177c6185ccda79733c5d89c7ba5439fb22352