From: yomguy <yomguy@parisson.com>
Date: Thu, 4 Apr 2013 14:02:45 +0000 (+0200)
Subject: Merge branch 'dev' into crem2
X-Git-Tag: 1.4.5~2^2~4^2~2^2~22
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4168d7c6d468220c782eeef8e7fc7706459df720;p=telemeta.git

Merge branch 'dev' into crem2
---

4168d7c6d468220c782eeef8e7fc7706459df720