From: Thomas Fillon <thomas@parisson.com>
Date: Thu, 31 Oct 2013 17:10:38 +0000 (+0100)
Subject: Fix conflicts before merge
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ab921d65d6e940d8d8ed2ad7c025f6e55a7f7931;p=timeside-diadems.git

Fix conflicts before merge
---

ab921d65d6e940d8d8ed2ad7c025f6e55a7f7931