From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 28 Jun 2013 22:36:09 +0000 (+0200)
Subject: Merge branch 'dev' into crem2
X-Git-Tag: 1.5.0rc3~45
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c71b18ef59433092a1eb49d1d1735e5c5f443010;p=telemeta.git

Merge branch 'dev' into crem2
---

c71b18ef59433092a1eb49d1d1735e5c5f443010