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

Merge branch 'dev'
---

d78086be8fb43ddc87fa8ea4139d77c0a91d5a75