From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 9 Jan 2014 14:17:30 +0000 (+0100)
Subject: Merge branch 'dev' into crem2
X-Git-Tag: 1.5.0rc3~11
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b806ed26d5c213e0153833d4f95f678c8efbdd8f;p=telemeta.git

Merge branch 'dev' into crem2
---

b806ed26d5c213e0153833d4f95f678c8efbdd8f