From: Thomas Fillon <thomas@parisson.com>
Date: Tue, 27 May 2014 11:33:59 +0000 (+0200)
Subject: Merge branch 'dev' into parameters_with_traits
X-Git-Tag: 0.6~4^2~51^2~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=bc4b88629da9cd66384d4c5d313aaad8c38dd712;p=timeside.git

Merge branch 'dev' into parameters_with_traits
---

bc4b88629da9cd66384d4c5d313aaad8c38dd712