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

Merge branch 'master' into wipe
---

b63909ee93d14fb6161180c2b4e63bf35d4112a8