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

Merge branch 'master' into wipe
---

3cc250411a102d9372209c8d948900e07e383e99