From: Guillaume Pellerin Date: Tue, 2 Sep 2014 15:39:39 +0000 (+0200) Subject: Merge branch 'dev' into crem X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a4458e5b9db48332dee227ef7993e5c076c62f3e;p=telemeta.git Merge branch 'dev' into crem --- a4458e5b9db48332dee227ef7993e5c076c62f3e