From: tbaudier <thomas.baudier@creatis.insa-lyon.fr>
Date: Tue, 14 Jun 2016 06:24:55 +0000 (+0200)
Subject: Merge branch 'static'
X-Git-Tag: v1.4.0~21
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=8e3fa5a364bc439812785f96cd0bbfcefd86d544;p=clitk.git

Merge branch 'static'
---

8e3fa5a364bc439812785f96cd0bbfcefd86d544