From: Guillaume Pellerin <yomguy@parisson.com>
Date: Sun, 29 Jun 2014 20:34:52 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=519b839fd42adf7aa8d8b5920ce69269e246bb64;p=telemeta-doc.git

Merge branch 'dev'
---

519b839fd42adf7aa8d8b5920ce69269e246bb64