From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 23 Jan 2014 08:54:02 +0000 (+0100)
Subject: Merge branch 'dev' into sabiod
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=refs%2Fheads%2Fsabiod;p=telemeta.git

Merge branch 'dev' into sabiod
---

1da554c982e8c0b2bcf14e74d6d091639e86ad62