From: Thomas Fillon <thomas@parisson.com>
Date: Thu, 17 Jul 2014 11:55:09 +0000 (+0200)
Subject: Merge Dev into parameters_with_traits
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=08f25a38c6381820da7b09d85d0ad20b6d0b95cf;p=timeside-diadems.git

Merge Dev into parameters_with_traits
---

08f25a38c6381820da7b09d85d0ad20b6d0b95cf