From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 20 May 2013 20:21:10 +0000 (+0200)
Subject: Merge branch 'dev' into crem2
X-Git-Tag: 1.4.5~2^2~4^2^2~5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8da1e7b935fce1de9120b15aa00678a4bacbfa2e;p=telemeta.git

Merge branch 'dev' into crem2
---

8da1e7b935fce1de9120b15aa00678a4bacbfa2e