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

Merge branch 'dev'
---

ae4a88e674c8861aa9b7a06ecb31a4b5c97c4e86