From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 8 Jul 2014 07:39:11 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f471bf3229eb33434fcd5fe2638182da00a2434e;p=telemeta-doc.git

Merge branch 'dev'
---

f471bf3229eb33434fcd5fe2638182da00a2434e