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

Merge branch 'master' into wipe
---

3d90ecb44273debd670737bb11bf9af8dabf625f