From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 11 Oct 2013 13:53:11 +0000 (+0200)
Subject: Merge branch 'dev' into crem2
X-Git-Tag: 1.5.0rc3~44
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e68faa8d15d0c2a4938f22d1fe2b7e01b0a514d8;p=telemeta.git

Merge branch 'dev' into crem2
---

e68faa8d15d0c2a4938f22d1fe2b7e01b0a514d8