From: Thomas Fillon <thomas@parisson.com>
Date: Sun, 15 Jun 2014 19:04:27 +0000 (+0200)
Subject: Merge Dev from github
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=1e55b88b1b0f3ce40354282fc49d3558e1e57889;p=telemeta-doc.git

Merge Dev from github
---

1e55b88b1b0f3ce40354282fc49d3558e1e57889