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

Merge branch 'dev'
---

96327663d2b3d74042f490f6783aac6271262bac