From: Thomas Fillon <thomas@parisson.com>
Date: Fri, 12 Jun 2015 00:17:36 +0000 (+0200)
Subject: FMA_2015 : merge commits
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=61157ec0c7a58381f94f1437255261db888b3c35;p=telemeta-doc.git

FMA_2015 : merge commits
---

61157ec0c7a58381f94f1437255261db888b3c35