From: Thomas Fillon <thomas@parisson.com>
Date: Mon, 19 Aug 2013 13:40:51 +0000 (+0200)
Subject: resolve conflict with origin to fix merging issues
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=781490adc9503ba38eb29cefb8da33eba2812629;p=timeside-diadems.git

resolve conflict with origin to fix merging issues
---

781490adc9503ba38eb29cefb8da33eba2812629