From: Thomas Fillon <thomas@parisson.com>
Date: Thu, 17 Jul 2014 12:34:06 +0000 (+0200)
Subject: Merge branch 'parameters_with_traits' into dev
X-Git-Tag: 0.6~4^2~51
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c208876359c8d4c1e36e3b8285e2bfc47d39c24a;p=timeside.git

Merge branch 'parameters_with_traits' into dev
---

c208876359c8d4c1e36e3b8285e2bfc47d39c24a