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

Merge branch 'dev' into crem2
---

2461945e88228f85ff4e42d8085988e2c43bdd4d