From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 8 Jan 2014 22:45:31 +0000 (+0100)
Subject: Merge branch 'dev' into crem2
X-Git-Tag: 1.5.0rc3~14
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d0d2f282da8c3ab9b81a28ead3e4286d794eef76;p=telemeta.git

Merge branch 'dev' into crem2
---

d0d2f282da8c3ab9b81a28ead3e4286d794eef76