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

Merge branch 'dev'
---

f23bc4cd1b16945f25bb241ee02e5618199e588f