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

Merge branch 'dev'
---

3fb1597d53f88595c8c8435d1ccd2fa106d71ac1