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

Merge branch 'dev'
---

086a3bb4d383c4f69c1a516b7c9f15d3ae7f7c92