From: Thomas Fillon <thomas@parisson.com>
Date: Thu, 9 Oct 2014 09:14:43 +0000 (+0200)
Subject: merge github/master into local master (Thomas)
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9c2484ea5e8c44bfe50ee5b8b8dacb81e8fe9be4;p=telemeta-doc.git

merge github/master into local master (Thomas)
---

9c2484ea5e8c44bfe50ee5b8b8dacb81e8fe9be4