From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 16 Dec 2014 15:33:58 +0000 (+0100)
Subject: Merge branch 'dev' into crem2
X-Git-Tag: 1.5.0rc4~15
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d73be29186b07de31b7af38830c13e58fa7b5d4d;p=telemeta.git

Merge branch 'dev' into crem2
---

d73be29186b07de31b7af38830c13e58fa7b5d4d