From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 14 May 2014 22:32:38 +0000 (+0200)
Subject: Merge branch 'dev' into crem
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=31c11b2a078438ca4329553d704ca131427cb623;p=telemeta.git

Merge branch 'dev' into crem
---

31c11b2a078438ca4329553d704ca131427cb623