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

Merge branch 'master' into wipe
---

3cc0214f9884ec4326fea11281289c954cf1bc06