From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 19 Dec 2013 11:13:21 +0000 (+0100)
Subject: Merge branch 'dev' into crem2
X-Git-Tag: 1.5.0rc3~29
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=49f47d8b557227e39a46534fcf06eb3ff4839d39;p=telemeta.git

Merge branch 'dev' into crem2
---

49f47d8b557227e39a46534fcf06eb3ff4839d39