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

Merge branch 'master' into wipe
---

0b4d512916fbaf29f2f52f7f24aa9af37ce24ece