From: Thomas Fillon <thomas@parisson.com>
Date: Tue, 25 Feb 2014 15:59:23 +0000 (+0100)
Subject: Merge pull request #42 from DavidDoukhan/dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=319319ec5e372ae1cbc1fe277510ad2eff7d3e59;p=timeside-diadems.git

Merge pull request #42 from DavidDoukhan/dev

better comment
---

319319ec5e372ae1cbc1fe277510ad2eff7d3e59