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

Merge branch 'master' into wipe
---

5dea4b57d73b4fd68abe0cbf77837084f606a860