From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 16 Apr 2013 12:30:07 +0000 (+0200)
Subject: Merge branch 'dev' into crem2
X-Git-Tag: 1.4.5~2^2~4^2~2^2~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c7596d7ef09d3a2df0856c94c3107ecc7e89924a;p=telemeta.git

Merge branch 'dev' into crem2
---

c7596d7ef09d3a2df0856c94c3107ecc7e89924a