From: yomguy <yomguy@parisson.com>
Date: Wed, 19 Sep 2012 12:23:05 +0000 (+0200)
Subject: Merge branch 'dev' into gst
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=fda63f7f7c9bf83e3e3c97bec83ce569a0fdcd72;p=timeside-diadems.git

Merge branch 'dev' into gst
---

fda63f7f7c9bf83e3e3c97bec83ce569a0fdcd72