From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 15 Apr 2013 13:27:45 +0000 (+0200)
Subject: Merge branch 'dev' into crem2
X-Git-Tag: 1.4.5~2^2~4^2~2^2~10
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9bbb0c7e7373789e56efb4095a945efdeddb2892;p=telemeta.git

Merge branch 'dev' into crem2
---

9bbb0c7e7373789e56efb4095a945efdeddb2892