From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 24 Sep 2014 08:18:10 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4537db2ea84143d81dff7346d930b8729a344d67;p=telemeta-doc.git

Merge branch 'dev'
---

4537db2ea84143d81dff7346d930b8729a344d67