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

Merge branch 'dev' into crem2
---

a261b6c2e670bd6ce75ca29c82ed3bd5e029df62