From: tbaudier <thomas.baudier@creatis.insa-lyon.fr>
Date: Tue, 17 Jan 2017 14:46:57 +0000 (+0100)
Subject: Merge branch 'master' into wipe
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=3093571e6abc7aa85586fbf509b51583f5e86212;p=clitk.git

Merge branch 'master' into wipe
---

3093571e6abc7aa85586fbf509b51583f5e86212