From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 12 Sep 2014 09:13:57 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=36703903dca738316317198288b79a9896568007;p=telemeta-doc.git

Merge branch 'dev'
---

36703903dca738316317198288b79a9896568007