From: tbaudier <thomas.baudier@creatis.insa-lyon.fr>
Date: Thu, 19 Jan 2017 08:06:34 +0000 (+0100)
Subject: Merge branch 'master' into wipe
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=71021d34bda3e0e61917cdc1780f7ed901714965;p=clitk.git

Merge branch 'master' into wipe
---

71021d34bda3e0e61917cdc1780f7ed901714965